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

annotate Modules/socketmodule.c @ 42257:c280647c330c

c_char, c_char_p objects and c_char array structure fields return their value now as str, no longer str8.

author	Thomas Heller <theller@ctypes.org>
date	Fri, 13 Jul 2007 12:52:51 +0000
parents	229c28cb9afb
children	e70cdce0e8b2

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
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	10 portable manner, though AF_PACKET and AF_NETLINK are supported 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	11 - 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	12 - 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	13 for by socket.py).
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	14
2565 912813d573b4 fixed up comments describing interface Guido van Rossum <guido@python.org> parents: 2532 diff changeset	15 Module interface:
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	16
2565 912813d573b4 fixed up comments describing interface Guido van Rossum <guido@python.org> parents: 2532 diff changeset	17 - 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	18 - socket.gaierror: exception raised for getaddrinfo/getnameinfo errors,
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	19 a subclass of socket.error
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	20 - socket.herror: exception raised for gethostby* errors,
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	21 a subclass of socket.error
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	22 - 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	23 - 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	24 - 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	25 - 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	26 - 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	27 - socket.getservbyport(portnumber[, protocolname]) --> service name
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	28 - socket.socket([family[, type [, proto, fileno]]]) --> new socket object
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	29 (fileno specifies a pre-existing socket file descriptor)
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	30 - 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	31 - 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	32 - 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	33 - 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	34 - 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	35 - socket.getaddrinfo(host, port [, family, socktype, proto, flags])
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	36 --> List of (family, socktype, proto, canonname, sockaddr)
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	37 - socket.getnameinfo(sockaddr, flags) --> (host, port)
2565 912813d573b4 fixed up comments describing interface Guido van Rossum <guido@python.org> parents: 2532 diff changeset	38 - 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	39 - 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	40 - 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	41 - 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	42 - socket.getdefaulttimeout() -> None \| float
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	43 - socket.setdefaulttimeout(None \| float)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	44 - an Internet socket address is a pair (hostname, port)
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	45 where hostname can be anything recognized by gethostbyname()
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	46 (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	47 - 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	48 - 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	49 - 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	50 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	51 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	52 ("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	53 specify packet-type and ha-type/addr.
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	54
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	55 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	56
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	57 - 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	58 - 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	59 - 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	60
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	61 */
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	62
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	63 #ifdef __APPLE__
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	64 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	65 * inet_aton is not available on OSX 10.3, yet we want to use a binary
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	66 * that was build on 10.4 or later to work on that release, weak linking
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	67 * comes to the rescue.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	68 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	69 # pragma weak inet_aton
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	70 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	71
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	72 #include "Python.h"
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	73 #include "structmember.h"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	74
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	75 #undef MAX
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	76 #define MAX(x, y) ((x) < (y) ? (y) : (x))
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	77
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	78 /* Socket object documentation */
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	79 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	80 "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	81 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	82 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	83 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	84 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	85 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	86 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	87 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	88 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	89 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	90 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	91 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	92 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	93 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	94 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	95 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	96 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	97 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	98 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	99 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	100 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	101 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	102 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	103 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	104 recv(buflen[, flags]) -- receive data\n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	105 recv_into(buffer[, nbytes[, flags]]) -- receive data (into a buffer)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	106 recvfrom(buflen[, flags]) -- receive data and sender\'s address\n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	107 recvfrom_into(buffer[, nbytes, [, flags])\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	108 -- 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	109 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	110 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	111 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	112 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	113 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	114 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	115 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	116 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	117 [*] not available on all platforms!");
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	118
30722 651fc8d98d99 Fix a bunch of typos in documentation, docstrings and comments. Walter Dörwald <walter@livinglogic.de> parents: 30683 diff changeset	119 /* 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	120 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	121
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	122 /* 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	123 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	124 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	125 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	126
adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	127 #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	128 # 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	129 # 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	130 # 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	131 #endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	132
10579 1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	133 #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	134 # 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	135 #endif
1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	136
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	137 #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	138 # 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	139 # 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	140 # 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	141 # 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	142 # 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	143 /* 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	144 # 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	145 # 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	146 # endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	147 #endif
dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	148
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	149 #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	150 !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	151 # define USE_GETHOSTBYNAME_LOCK
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	152 #endif
9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	153
35635 27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	154 /* To use __FreeBSD_version */
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	155 #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	156 #include <sys/param.h>
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	157 #endif
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	158 /* 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	159 (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	160 #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	161 (defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) \|\| \
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	162 defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| \
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	163 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	164 #define USE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	165 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	166
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	167 #ifdef USE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	168 #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	169 #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	170 #else
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	171 #define ACQUIRE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	172 #define RELEASE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	173 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	174
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	175 #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	176 # include "pythread.h"
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	177 #endif
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	178
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	179 #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	180 # 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	181 # 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	182 # 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	183 # 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	184 # include <ctype.h>
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	185 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	186
26551 0c995cd07026 Don't include <ioctl.h> unless on __VMS. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	187 #if defined(__VMS)
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	188 # include <ioctl.h>
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	189 #endif
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	190
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	191 #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	192 # 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	193 # 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	194 # 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	195 # include <os2.h>
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	196 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	197
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	198 #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	199 /* 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	200 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	201 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	202
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	203 /* 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	204 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	205 #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	206 #define _SGIAPI 1
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	207
33478 1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	208 #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	209 #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	210 #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	211 #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	212 #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	213 #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	214 #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	215 #endif
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	216
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	217 #define HAVE_INET_PTON
08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	218 #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	219 #endif
337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	220
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	221 /* Irix 6.5 fails to define this variable at all. This is needed
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	222 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	223 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	224 #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	225 #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	226 #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	227
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	228 /* Generic includes */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	229 #ifdef HAVE_SYS_TYPES_H
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	230 #include <sys/types.h>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	231 #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	232
21961 ea23e6e49290 Also fix the comment. Marc-André Lemburg <mal@egenix.com> parents: 21960 diff changeset	233 /* 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	234 #define PySocket_BUILDING_SOCKET
21960 7a917ad8f442 Fix the name of the header file. Marc-André Lemburg <mal@egenix.com> parents: 21959 diff changeset	235 #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	236
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	237 /* 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	238
3738 ce74bba8a6a6 Slightly different Windows ifdefs Guido van Rossum <guido@python.org> parents: 3702 diff changeset	239 #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	240
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	241 /* 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	242 # 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	243
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	244 /* 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	245 # 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	246 # 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	247 # 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	248 # 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	249 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	250 # 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	251 # 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	252 # 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	253
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 # 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	255 # 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	256 # else
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	257 # 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	258 # 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	259 # define NO_DUP
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	260 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	261 # 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	262 # 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	263
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	264 #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	265
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	266 /* MS_WINDOWS includes */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	267 # ifdef HAVE_FCNTL_H
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	268 # include <fcntl.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	269 # 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	270
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	271 #endif
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	272
31504 2abc52c3d4c2 remove support for missing ANSI C header files (limits.h, stddef.h, etc). Skip Montanaro <skip@pobox.com> parents: 31443 diff changeset	273 #include <stddef.h>
18263 41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	274
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	275 #ifndef offsetof
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	276 # 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	277 #endif
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	278
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	279 #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	280 # define O_NONBLOCK O_NDELAY
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	281 #endif
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	282
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	283 /* 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	284 #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	285 /* 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	286 * _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	287 * 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	288 */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	289 #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	290 /* 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	291 * 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	292 */
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	293 #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	294 # 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	295 #endif
33066 cda0455bd0a0 Bug #1001857: socketmodule does not build under cygwin Jason Tishler <jason@tishler.net> parents: 33063 diff changeset	296
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	297 #ifndef HAVE_INET_PTON
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	298 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	299 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	300 #endif
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	301
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	302 #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	303 /* 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	304 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	305 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	306 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	307 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	308 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	309 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	310 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	311 #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	312 /* 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	313 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	314 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	315 #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	316 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	317
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	318 #ifdef HAVE_INET_ATON
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	319 #define USE_INET_ATON_WEAKLINK
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	320 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	321
24078 702a5900df7d Mac OS X Jaguar (developer preview) seems to have a working getaddrinfo(). Jack Jansen <jack.jansen@cwi.nl> parents: 23832 diff changeset	322 #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	323
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	324 /* 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	325 #if !defined(HAVE_GETADDRINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	326 /* 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	327 #define getaddrinfo fake_getaddrinfo
b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	328 #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	329 #define freeaddrinfo fake_freeaddrinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	330 #include "getaddrinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	331 #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	332 #if !defined(HAVE_GETNAMEINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	333 #define getnameinfo fake_getnameinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	334 #include "getnameinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	335 #endif
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	336
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	337 #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	338 /* 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	339 /* 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	340 #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	341 #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	342 #endif
a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	343
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	344 #ifdef MS_WIN32
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	345 #define EAFNOSUPPORT WSAEAFNOSUPPORT
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	346 #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	347 #endif
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	348
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	349 #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	350 #define SOCKETCLOSE soclose
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	351 #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	352 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	353
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	354 #ifndef SOCKETCLOSE
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	355 #define SOCKETCLOSE close
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	356 #endif
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	357
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	358 #if defined(HAVE_BLUETOOTH_H) \|\| defined(HAVE_BLUETOOTH_BLUETOOTH_H)
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	359 #define USE_BLUETOOTH 1
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	360 #if defined(__FreeBSD__)
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	361 #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	362 #define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	363 #define BTPROTO_HCI BLUETOOTH_PROTO_HCI
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	364 #define SOL_HCI SOL_HCI_RAW
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	365 #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	366 #define sockaddr_l2 sockaddr_l2cap
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	367 #define sockaddr_rc sockaddr_rfcomm
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	368 #define hci_dev hci_node
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	369 #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	370 #define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	371 #define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	372 #elif defined(__NetBSD__)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	373 #define sockaddr_l2 sockaddr_bt
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	374 #define sockaddr_rc sockaddr_bt
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	375 #define sockaddr_hci sockaddr_bt
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	376 #define sockaddr_sco sockaddr_bt
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	377 #define _BT_L2_MEMB(sa, memb) ((sa)->bt_##memb)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	378 #define _BT_RC_MEMB(sa, memb) ((sa)->bt_##memb)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	379 #define _BT_HCI_MEMB(sa, memb) ((sa)->bt_##memb)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	380 #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	381 #else
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	382 #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	383 #define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	384 #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	385 #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	386 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	387 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	388
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	389 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	390 /* TCP/IP Services for VMS uses a maximum send/recv buffer length */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	391 #define SEGMENT_SIZE (32 * 1024 -1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	392 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	393
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	394 #define SAS2SA(x) ((struct sockaddr *)(x))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	395
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	396 /*
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	397 * 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	398 */
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	399 #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	400 #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	401 #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	402 #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	403 #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	404 #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	405
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	406 #ifndef INVALID_SOCKET /* MS defines this */
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	407 #define INVALID_SOCKET (-1)
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	408 #endif
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	409
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	410 /* 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	411 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	412
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	413 /* 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	414 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	415 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	416 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	417 static PyObject *socket_gaierror;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	418 static PyObject *socket_timeout;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	419
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	420 #ifdef RISCOS
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	421 /* 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	422 static int taskwindow;
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	423 #endif
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	424
21970 b1a871dc5196 Moved the declaration of PySocketSock_Type from socketmodule.h to Tim Peters <tim.peters@gmail.com> parents: 21964 diff changeset	425 /* 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	426 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	427 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	428 there has to be a circular reference. */
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24078 diff changeset	429 static PyTypeObject sock_type;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	430
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	431 #if defined(HAVE_POLL_H)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	432 #include <poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	433 #elif defined(HAVE_SYS_POLL_H)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	434 #include <sys/poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	435 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	436
36476 c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	437 #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	438 /* 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	439 #define IS_SELECTABLE(s) 1
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	440 #elif defined(HAVE_POLL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	441 /* Instead of select(), we'll use poll() since poll() works on any fd. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	442 #define IS_SELECTABLE(s) 1
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	443 /* 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	444 #else
c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	445 /* POSIX says selecting file descriptors beyond FD_SETSIZE
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	446 has undefined behaviour. If there's no timeout left, we don't have to
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	447 call select, so it's a safe, little white lie. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	448 #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	449 #endif
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	450
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	451 static PyObject*
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	452 select_error(void)
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	453 {
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	454 PyErr_SetString(socket_error, "unable to select on socket");
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	455 return NULL;
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	456 }
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	457
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	458 /* 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	459 and return a NULL pointer from a function. */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	460
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	461 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	462 set_error(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	463 {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	464 #ifdef MS_WINDOWS
13680 9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	465 int err_no = WSAGetLastError();
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	466 static struct {
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	467 int no;
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	468 const char *msg;
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	469 } *msgp, msgs[] = {
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	470 {WSAEINTR, "Interrupted system call"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	471 {WSAEBADF, "Bad file descriptor"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	472 {WSAEACCES, "Permission denied"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	473 {WSAEFAULT, "Bad address"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	474 {WSAEINVAL, "Invalid argument"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	475 {WSAEMFILE, "Too many open files"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	476 {WSAEWOULDBLOCK,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	477 "The socket operation could not complete "
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	478 "without blocking"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	479 {WSAEINPROGRESS, "Operation now in progress"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	480 {WSAEALREADY, "Operation already in progress"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	481 {WSAENOTSOCK, "Socket operation on non-socket"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	482 {WSAEDESTADDRREQ, "Destination address required"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	483 {WSAEMSGSIZE, "Message too long"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	484 {WSAEPROTOTYPE, "Protocol wrong type for socket"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	485 {WSAENOPROTOOPT, "Protocol not available"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	486 {WSAEPROTONOSUPPORT, "Protocol not supported"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	487 {WSAESOCKTNOSUPPORT, "Socket type not supported"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	488 {WSAEOPNOTSUPP, "Operation not supported"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	489 {WSAEPFNOSUPPORT, "Protocol family not supported"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	490 {WSAEAFNOSUPPORT, "Address family not supported"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	491 {WSAEADDRINUSE, "Address already in use"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	492 {WSAEADDRNOTAVAIL, "Can't assign requested address"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	493 {WSAENETDOWN, "Network is down"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	494 {WSAENETUNREACH, "Network is unreachable"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	495 {WSAENETRESET, "Network dropped connection on reset"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	496 {WSAECONNABORTED, "Software caused connection abort"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	497 {WSAECONNRESET, "Connection reset by peer"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	498 {WSAENOBUFS, "No buffer space available"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	499 {WSAEISCONN, "Socket is already connected"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	500 {WSAENOTCONN, "Socket is not connected"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	501 {WSAESHUTDOWN, "Can't send after socket shutdown"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	502 {WSAETOOMANYREFS, "Too many references: can't splice"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	503 {WSAETIMEDOUT, "Operation timed out"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	504 {WSAECONNREFUSED, "Connection refused"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	505 {WSAELOOP, "Too many levels of symbolic links"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	506 {WSAENAMETOOLONG, "File name too long"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	507 {WSAEHOSTDOWN, "Host is down"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	508 {WSAEHOSTUNREACH, "No route to host"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	509 {WSAENOTEMPTY, "Directory not empty"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	510 {WSAEPROCLIM, "Too many processes"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	511 {WSAEUSERS, "Too many users"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	512 {WSAEDQUOT, "Disc quota exceeded"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	513 {WSAESTALE, "Stale NFS file handle"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	514 {WSAEREMOTE, "Too many levels of remote in path"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	515 {WSASYSNOTREADY, "Network subsystem is unvailable"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	516 {WSAVERNOTSUPPORTED, "WinSock version is not supported"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	517 {WSANOTINITIALISED,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	518 "Successful WSAStartup() not yet performed"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	519 {WSAEDISCON, "Graceful shutdown in progress"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	520 /* Resolver errors */
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	521 {WSAHOST_NOT_FOUND, "No such host is known"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	522 {WSATRY_AGAIN, "Host not found, or server failed"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	523 {WSANO_RECOVERY, "Unexpected server error encountered"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	524 {WSANO_DATA, "Valid name without requested data"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	525 {WSANO_ADDRESS, "No address, look for MX record"},
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	526 {0, NULL}
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	527 };
13680 9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	528 if (err_no) {
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	529 PyObject *v;
13680 9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	530 const char *msg = "winsock error";
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	531
13680 9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	532 for (msgp = msgs; msgp->msg; msgp++) {
9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	533 if (err_no == msgp->no) {
9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	534 msg = msgp->msg;
9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	535 break;
9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	536 }
9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	537 }
9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	538
9f6189e89212 Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch] Mark Hammond <mhammond@skippinet.com.au> parents: 13667 diff changeset	539 v = Py_BuildValue("(is)", err_no, msg);
1915 80818c106e3e * Modules/xxmodule.c: integrated with xxobject.c by Jack Guido van Rossum <guido@python.org> parents: 1867 diff changeset	540 if (v != NULL) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	541 PyErr_SetObject(socket_error, v);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	542 Py_DECREF(v);
1915 80818c106e3e * Modules/xxmodule.c: integrated with xxobject.c by Jack Guido van Rossum <guido@python.org> parents: 1867 diff changeset	543 }
80818c106e3e * Modules/xxmodule.c: integrated with xxobject.c by Jack Guido van Rossum <guido@python.org> parents: 1867 diff changeset	544 return NULL;
80818c106e3e * Modules/xxmodule.c: integrated with xxobject.c by Jack Guido van Rossum <guido@python.org> parents: 1867 diff changeset	545 }
80818c106e3e * Modules/xxmodule.c: integrated with xxobject.c by Jack Guido van Rossum <guido@python.org> parents: 1867 diff changeset	546 else
80818c106e3e * Modules/xxmodule.c: integrated with xxobject.c by Jack Guido van Rossum <guido@python.org> parents: 1867 diff changeset	547 #endif
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	548
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	549 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	550 if (sock_errno() != NO_ERROR) {
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	551 APIRET rc;
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	552 ULONG msglen;
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	553 char outbuf[100];
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	554 int myerrorcode = sock_errno();
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	555
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	556 /* Retrieve socket-related error message from MPTN.MSG file */
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	557 rc = DosGetMessage(NULL, 0, outbuf, sizeof(outbuf),
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	558 myerrorcode - SOCBASEERR + 26,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	559 "mptn.msg",
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	560 &msglen);
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	561 if (rc == NO_ERROR) {
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	562 PyObject *v;
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	563
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	564 /* OS/2 doesn't guarantee a terminator */
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	565 outbuf[msglen] = '\0';
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	566 if (strlen(outbuf) > 0) {
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	567 /* If non-empty msg, trim CRLF */
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	568 char *lastc = &outbuf[ strlen(outbuf)-1 ];
36090 8cb686dd6e64 Fix SF bug #1072182, problems with signed characters. Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	569 while (lastc > outbuf &&
8cb686dd6e64 Fix SF bug #1072182, problems with signed characters. Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	570 isspace(Py_CHARMASK(*lastc))) {
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	571 /* Trim trailing whitespace (CRLF) */
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	572 *lastc-- = '\0';
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	573 }
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	574 }
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	575 v = Py_BuildValue("(is)", myerrorcode, outbuf);
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	576 if (v != NULL) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	577 PyErr_SetObject(socket_error, v);
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	578 Py_DECREF(v);
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	579 }
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	580 return NULL;
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	581 }
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	582 }
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	583 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	584
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	585 #if defined(RISCOS)
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	586 if (_inet_error.errnum != NULL) {
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	587 PyObject *v;
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	588 v = Py_BuildValue("(is)", errno, _inet_err());
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	589 if (v != NULL) {
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	590 PyErr_SetObject(socket_error, v);
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	591 Py_DECREF(v);
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	592 }
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	593 return NULL;
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	594 }
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	595 #endif
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	596
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	597 return PyErr_SetFromErrno(socket_error);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	598 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	599
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	600
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	601 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	602 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	603 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	604 PyObject *v;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	605
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	606 #ifdef HAVE_HSTRERROR
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	607 v = Py_BuildValue("(is)", h_error, (char *)hstrerror(h_error));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	608 #else
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	609 v = Py_BuildValue("(is)", h_error, "host not found");
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	610 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	611 if (v != NULL) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	612 PyErr_SetObject(socket_herror, v);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	613 Py_DECREF(v);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	614 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	615
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	616 return NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	617 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	618
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	619
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	620 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	621 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	622 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	623 PyObject *v;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	624
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	625 #ifdef EAI_SYSTEM
9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	626 /* EAI_SYSTEM is not available on Windows XP. */
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	627 if (error == EAI_SYSTEM)
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	628 return set_error();
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	629 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	630
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	631 #ifdef HAVE_GAI_STRERROR
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	632 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	633 #else
1afc3116c602 Fix portability problems with glibc 2.0, as reported in #449157. Martin v. Löwis <martin@v.loewis.de> parents: 19197 diff changeset	634 v = Py_BuildValue("(is)", error, "getaddrinfo failed");
1afc3116c602 Fix portability problems with glibc 2.0, as reported in #449157. Martin v. Löwis <martin@v.loewis.de> parents: 19197 diff changeset	635 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	636 if (v != NULL) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	637 PyErr_SetObject(socket_gaierror, v);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	638 Py_DECREF(v);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	639 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	640
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	641 return NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	642 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	643
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	644 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	645 /* Function to send in segments */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	646 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	647 sendsegmented(int sock_fd, char *buf, int len, int flags)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	648 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	649 int n = 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	650 int remaining = len;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	651
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	652 while (remaining > 0) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	653 unsigned int segment;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	654
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	655 segment = (remaining >= SEGMENT_SIZE ? SEGMENT_SIZE : remaining);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	656 n = send(sock_fd, buf, segment, flags);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	657 if (n < 0) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	658 return n;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	659 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	660 remaining -= segment;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	661 buf += segment;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	662 } /* end while */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	663
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	664 return len;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	665 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	666 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	667
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	668 /* 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	669 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	670 static int
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	671 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	672 {
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	673 #ifndef RISCOS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	674 #ifndef MS_WINDOWS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	675 int delay_flag;
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	676 #endif
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	677 #endif
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	678
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	679 Py_BEGIN_ALLOW_THREADS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	680 #ifdef __BEOS__
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	681 block = !block;
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	682 setsockopt(s->sock_fd, SOL_SOCKET, SO_NONBLOCK,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	683 (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	684 #else
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	685 #ifndef RISCOS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	686 #ifndef MS_WINDOWS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	687 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	688 block = !block;
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	689 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	690 #elif defined(__VMS)
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	691 block = !block;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	692 ioctl(s->sock_fd, FIONBIO, (unsigned int *)&block);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	693 #else /* !PYOS_OS2 && !__VMS */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	694 delay_flag = fcntl(s->sock_fd, F_GETFL, 0);
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	695 if (block)
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	696 delay_flag &= (~O_NONBLOCK);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	697 else
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	698 delay_flag \|= O_NONBLOCK;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	699 fcntl(s->sock_fd, F_SETFL, delay_flag);
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	700 #endif /* !PYOS_OS2 */
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	701 #else /* MS_WINDOWS */
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	702 block = !block;
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	703 ioctlsocket(s->sock_fd, FIONBIO, (u_long*)&block);
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	704 #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	705 #else /* RISCOS */
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	706 block = !block;
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	707 socketioctl(s->sock_fd, FIONBIO, (u_long*)&block);
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	708 #endif /* RISCOS */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	709 #endif /* __BEOS__ */
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	710 Py_END_ALLOW_THREADS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	711
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	712 /* Since these don't return anything */
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	713 return 1;
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	714 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	715
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	716 /* 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	717 The argument writing indicates the direction.
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	718 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	719 after they've reacquired the interpreter lock.
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	720 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	721 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	722 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	723 {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	724 int n;
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	725
24317 29ae8e89153b Bail out early from internal_select() when socket file descriptor Guido van Rossum <guido@python.org> parents: 24305 diff changeset	726 /* Nothing to do unless we're in timeout mode (not non-blocking) */
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	727 if (s->sock_timeout <= 0.0)
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	728 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	729
24317 29ae8e89153b Bail out early from internal_select() when socket file descriptor Guido van Rossum <guido@python.org> parents: 24305 diff changeset	730 /* Guard against closed socket */
29ae8e89153b Bail out early from internal_select() when socket file descriptor Guido van Rossum <guido@python.org> parents: 24305 diff changeset	731 if (s->sock_fd < 0)
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	732 return 0;
24317 29ae8e89153b Bail out early from internal_select() when socket file descriptor Guido van Rossum <guido@python.org> parents: 24305 diff changeset	733
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	734 /* Prefer poll, if available, since you can poll() any fd
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	735 * which can't be done with select(). */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	736 #ifdef HAVE_POLL
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	737 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	738 struct pollfd pollfd;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	739 int timeout;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	740
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	741 pollfd.fd = s->sock_fd;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	742 pollfd.events = writing ? POLLOUT : POLLIN;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	743
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	744 /* s->sock_timeout is in seconds, timeout in ms */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	745 timeout = (int)(s->sock_timeout * 1000 + 0.5);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	746 n = poll(&pollfd, 1, timeout);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	747 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	748 #else
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	749 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	750 /* Construct the arguments to select */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	751 fd_set fds;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	752 struct timeval tv;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	753 tv.tv_sec = (int)s->sock_timeout;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	754 tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	755 FD_ZERO(&fds);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	756 FD_SET(s->sock_fd, &fds);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	757
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	758 /* See if the socket is ready */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	759 if (writing)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	760 n = select(s->sock_fd+1, NULL, &fds, NULL, &tv);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	761 else
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	762 n = select(s->sock_fd+1, &fds, NULL, NULL, &tv);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	763 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	764 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	765
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	766 if (n < 0)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	767 return -1;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	768 if (n == 0)
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	769 return 1;
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	770 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	771 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	772
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	773 /* 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	774
24305 428cbbf05639 A Python float is a C double; redeclare defaulttimeout as such; stops Tim Peters <tim.peters@gmail.com> parents: 24303 diff changeset	775 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	776
24363 979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24317 diff changeset	777 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	778 init_sockobject(PySocketSockObject *s,
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	779 SOCKET_T fd, int family, int type, int proto)
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	780 {
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	781 #ifdef RISCOS
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	782 int block = 1;
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	783 #endif
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	784 s->sock_fd = fd;
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	785 s->sock_family = family;
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	786 s->sock_type = type;
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	787 s->sock_proto = proto;
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	788 s->sock_timeout = defaulttimeout;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	789
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	790 s->errorhandler = &set_error;
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	791
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	792 if (defaulttimeout >= 0.0)
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	793 internal_setblocking(s, 0);
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	794
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	795 #ifdef RISCOS
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	796 if (taskwindow)
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	797 socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	798 #endif
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	799 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	800
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	801
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	802 /* Create a new socket object.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	803 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	804 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	805 in NEWOBJ()). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	806
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	807 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	808 new_sockobject(SOCKET_T fd, int family, int type, int proto)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	809 {
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	810 PySocketSockObject *s;
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	811 s = (PySocketSockObject *)
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	812 PyType_GenericNew(&sock_type, NULL, NULL);
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	813 if (s != NULL)
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	814 init_sockobject(s, fd, family, type, proto);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	815 return s;
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	816 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	817
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	818
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	819 /* 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	820 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	821 #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	822 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	823 #endif
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	824
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	825
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	826 /* 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	827 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	828 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	829 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	830 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	831
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	832 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	833 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	834 {
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	835 struct addrinfo hints, *res;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	836 int error;
28925 a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	837 int d1, d2, d3, d4;
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	838 char ch;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	839
4600 d36250aefb82 Keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	840 memset((void ) addr_ret, '\0', sizeof(addr_ret));
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	841 if (name[0] == '\0') {
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	842 int siz;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	843 memset(&hints, 0, sizeof(hints));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	844 hints.ai_family = af;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	845 hints.ai_socktype = SOCK_DGRAM; /dummy/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	846 hints.ai_flags = AI_PASSIVE;
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	847 Py_BEGIN_ALLOW_THREADS
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	848 ACQUIRE_GETADDRINFO_LOCK
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	849 error = getaddrinfo(NULL, "0", &hints, &res);
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	850 Py_END_ALLOW_THREADS
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	851 /* We assume that those thread-unsafe getaddrinfo() versions
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	852 are safe regarding their return value, ie. that a
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	853 subsequent call to getaddrinfo() does not destroy the
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	854 outcome of the first call. */
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	855 RELEASE_GETADDRINFO_LOCK
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	856 if (error) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	857 set_gaierror(error);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	858 return -1;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	859 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	860 switch (res->ai_family) {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	861 case AF_INET:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	862 siz = 4;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	863 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	864 #ifdef ENABLE_IPV6
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	865 case AF_INET6:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	866 siz = 16;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	867 break;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	868 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	869 default:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	870 freeaddrinfo(res);
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	871 PyErr_SetString(socket_error,
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	872 "unsupported address family");
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	873 return -1;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	874 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	875 if (res->ai_next) {
20912 06d95b6877c4 Fix memory leaks detecting in bug report #478003. Martin v. Löwis <martin@v.loewis.de> parents: 20871 diff changeset	876 freeaddrinfo(res);
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	877 PyErr_SetString(socket_error,
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	878 "wildcard resolved to multiple address");
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	879 return -1;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	880 }
24411 8e266d0acd10 Pass length of result structure into setipaddr. Fixes bug #565747. Martin v. Löwis <martin@v.loewis.de> parents: 24380 diff changeset	881 if (res->ai_addrlen < addr_ret_size)
8e266d0acd10 Pass length of result structure into setipaddr. Fixes bug #565747. Martin v. Löwis <martin@v.loewis.de> parents: 24380 diff changeset	882 addr_ret_size = res->ai_addrlen;
8e266d0acd10 Pass length of result structure into setipaddr. Fixes bug #565747. Martin v. Löwis <martin@v.loewis.de> parents: 24380 diff changeset	883 memcpy(addr_ret, res->ai_addr, addr_ret_size);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	884 freeaddrinfo(res);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	885 return siz;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	886 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	887 if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	888 struct sockaddr_in *sin;
26597 7ddea4dfa519 Patch #650422: Use Posix AF_ constants instead of PF_ ones. Martin v. Löwis <martin@v.loewis.de> parents: 26551 diff changeset	889 if (af != AF_INET && af != AF_UNSPEC) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	890 PyErr_SetString(socket_error,
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	891 "address family mismatched");
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	892 return -1;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	893 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	894 sin = (struct sockaddr_in *)addr_ret;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	895 memset((void ) sin, '\0', sizeof(sin));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	896 sin->sin_family = AF_INET;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	897 #ifdef HAVE_SOCKADDR_SA_LEN
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	898 sin->sin_len = sizeof(*sin);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	899 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	900 sin->sin_addr.s_addr = INADDR_BROADCAST;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	901 return sizeof(sin->sin_addr);
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	902 }
28925 a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	903 if (sscanf(name, "%d.%d.%d.%d%c", &d1, &d2, &d3, &d4, &ch) == 4 &&
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	904 0 <= d1 && d1 <= 255 && 0 <= d2 && d2 <= 255 &&
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	905 0 <= d3 && d3 <= 255 && 0 <= d4 && d4 <= 255) {
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	906 struct sockaddr_in *sin;
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	907 sin = (struct sockaddr_in *)addr_ret;
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	908 sin->sin_addr.s_addr = htonl(
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	909 ((long) d1 << 24) \| ((long) d2 << 16) \|
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	910 ((long) d3 << 8) \| ((long) d4 << 0));
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	911 sin->sin_family = AF_INET;
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	912 #ifdef HAVE_SOCKADDR_SA_LEN
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	913 sin->sin_len = sizeof(*sin);
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	914 #endif
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	915 return 4;
a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	916 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	917 memset(&hints, 0, sizeof(hints));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	918 hints.ai_family = af;
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	919 Py_BEGIN_ALLOW_THREADS
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	920 ACQUIRE_GETADDRINFO_LOCK
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	921 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	922 #if defined(__digital__) && defined(__unix__)
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	923 if (error == EAI_NONAME && af == AF_UNSPEC) {
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	924 /* On Tru64 V5.1, numeric-to-addr conversion fails
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	925 if no address family is given. Assume IPv4 for now.*/
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	926 hints.ai_family = AF_INET;
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	927 error = getaddrinfo(name, NULL, &hints, &res);
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	928 }
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	929 #endif
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	930 Py_END_ALLOW_THREADS
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	931 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	932 if (error) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	933 set_gaierror(error);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	934 return -1;
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	935 }
24411 8e266d0acd10 Pass length of result structure into setipaddr. Fixes bug #565747. Martin v. Löwis <martin@v.loewis.de> parents: 24380 diff changeset	936 if (res->ai_addrlen < addr_ret_size)
8e266d0acd10 Pass length of result structure into setipaddr. Fixes bug #565747. Martin v. Löwis <martin@v.loewis.de> parents: 24380 diff changeset	937 addr_ret_size = res->ai_addrlen;
8e266d0acd10 Pass length of result structure into setipaddr. Fixes bug #565747. Martin v. Löwis <martin@v.loewis.de> parents: 24380 diff changeset	938 memcpy((char *) addr_ret, res->ai_addr, addr_ret_size);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	939 freeaddrinfo(res);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	940 switch (addr_ret->sa_family) {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	941 case AF_INET:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	942 return 4;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	943 #ifdef ENABLE_IPV6
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	944 case AF_INET6:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	945 return 16;
10441 9ba5dffccb1b Jonathan Giddy writes: Guido van Rossum <guido@python.org> parents: 10401 diff changeset	946 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	947 default:
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	948 PyErr_SetString(socket_error, "unknown address family");
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	949 return -1;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	950 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	951 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	952
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	953
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	954 /* 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	955 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	956 size numbers). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	957
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	958 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	959 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	960 {
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	961 char buf[NI_MAXHOST];
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	962 int error;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	963
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	964 error = getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0,
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	965 NI_NUMERICHOST);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	966 if (error) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	967 set_gaierror(error);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	968 return NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	969 }
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	970 return PyString_FromString(buf);
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	971 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	972
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	973
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	974 #ifdef USE_BLUETOOTH
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	975 /* 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	976 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	977 an error occurred. */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	978
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	979 static int
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	980 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	981 {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	982 unsigned int b0, b1, b2, b3, b4, b5;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	983 char ch;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	984 int n;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	985
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	986 n = sscanf(name, "%X:%X:%X:%X:%X:%X%c",
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	987 &b5, &b4, &b3, &b2, &b1, &b0, &ch);
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	988 if (n == 6 && (b0 \| b1 \| b2 \| b3 \| b4 \| b5) < 256) {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	989 bdaddr->b[0] = b0;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	990 bdaddr->b[1] = b1;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	991 bdaddr->b[2] = b2;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	992 bdaddr->b[3] = b3;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	993 bdaddr->b[4] = b4;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	994 bdaddr->b[5] = b5;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	995 return 6;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	996 } else {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	997 PyErr_SetString(socket_error, "bad bluetooth address");
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	998 return -1;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	999 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1000 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1001
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1002 /* 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	1003 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	1004 value (zero padded if necessary). */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1005
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1006 static PyObject *
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1007 makebdaddr(bdaddr_t *bdaddr)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1008 {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1009 char buf[(6 * 2) + 5 + 1];
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1010
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1011 sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1012 bdaddr->b[5], bdaddr->b[4], bdaddr->b[3],
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1013 bdaddr->b[2], bdaddr->b[1], bdaddr->b[0]);
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1014 return PyString_FromString(buf);
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1015 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1016 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1017
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1018
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1019 /* 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	1020 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	1021 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	1022 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	1023
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1024 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1025 static PyObject *
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1026 makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1027 {
925 61143bf03b44 Sometimes, recvfrom() returns an empty address; this is not an error. Guido van Rossum <guido@python.org> parents: 902 diff changeset	1028 if (addrlen == 0) {
61143bf03b44 Sometimes, recvfrom() returns an empty address; this is not an error. Guido van Rossum <guido@python.org> parents: 902 diff changeset	1029 /* No address -- may be recvfrom() from known socket */
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1030 Py_INCREF(Py_None);
84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1031 return Py_None;
925 61143bf03b44 Sometimes, recvfrom() returns an empty address; this is not an error. Guido van Rossum <guido@python.org> parents: 902 diff changeset	1032 }
61143bf03b44 Sometimes, recvfrom() returns an empty address; this is not an error. Guido van Rossum <guido@python.org> parents: 902 diff changeset	1033
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1034 #ifdef __BEOS__
12492 1725e802e3eb Patch by Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12479 diff changeset	1035 /* XXX: BeOS version of accept() doesn't set family correctly */
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1036 addr->sa_family = AF_INET;
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1037 #endif
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1038
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1039 switch (addr->sa_family) {
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1040
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1041 case AF_INET:
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1042 {
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1043 struct sockaddr_in *a;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1044 PyObject addrobj = makeipaddr(addr, sizeof(a));
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1045 PyObject *ret = NULL;
a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1046 if (addrobj) {
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1047 a = (struct sockaddr_in *)addr;
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1048 ret = Py_BuildValue("Oi", addrobj, ntohs(a->sin_port));
a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1049 Py_DECREF(addrobj);
a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1050 }
1207 b564bd4e57e1 * ceval.c: ifdef out the last argument passing compat hack. Guido van Rossum <guido@python.org> parents: 1132 diff changeset	1051 return ret;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1052 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1053
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	1054 #if defined(AF_UNIX)
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1055 case AF_UNIX:
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1056 {
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1057 struct sockaddr_un a = (struct sockaddr_un ) addr;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1058 #ifdef linux
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1059 if (a->sun_path[0] == 0) { /* Linux abstract namespace */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1060 addrlen -= (sizeof(*a) - sizeof(a->sun_path));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1061 return PyString_FromStringAndSize(a->sun_path,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1062 addrlen);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1063 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1064 else
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1065 #endif /* linux */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1066 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1067 /* regular NULL-terminated string */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1068 return PyString_FromString(a->sun_path);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1069 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1070 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1071 #endif /* AF_UNIX */
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1072
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1073 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1074 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1075 {
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1076 struct sockaddr_nl a = (struct sockaddr_nl ) addr;
36289 7ca51cb70c2e Change build format of netlink addresses. Martin v. Löwis <martin@v.loewis.de> parents: 36286 diff changeset	1077 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	1078 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1079 #endif /* AF_NETLINK */
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1080
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1081 #ifdef ENABLE_IPV6
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1082 case AF_INET6:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1083 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1084 struct sockaddr_in6 *a;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1085 PyObject addrobj = makeipaddr(addr, sizeof(a));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1086 PyObject *ret = NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1087 if (addrobj) {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1088 a = (struct sockaddr_in6 *)addr;
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1089 ret = Py_BuildValue("Oiii",
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1090 addrobj,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1091 ntohs(a->sin6_port),
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1092 a->sin6_flowinfo,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1093 a->sin6_scope_id);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1094 Py_DECREF(addrobj);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1095 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1096 return ret;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1097 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1098 #endif
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1099
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1100 #ifdef USE_BLUETOOTH
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1101 case AF_BLUETOOTH:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1102 switch (proto) {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1103
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1104 case BTPROTO_L2CAP:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1105 {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1106 struct sockaddr_l2 a = (struct sockaddr_l2 ) addr;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1107 PyObject *addrobj = makebdaddr(&_BT_L2_MEMB(a, bdaddr));
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1108 PyObject *ret = NULL;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1109 if (addrobj) {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1110 ret = Py_BuildValue("Oi",
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1111 addrobj,
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1112 _BT_L2_MEMB(a, psm));
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1113 Py_DECREF(addrobj);
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1114 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1115 return ret;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1116 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1117
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1118 case BTPROTO_RFCOMM:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1119 {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1120 struct sockaddr_rc a = (struct sockaddr_rc ) addr;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1121 PyObject *addrobj = makebdaddr(&_BT_RC_MEMB(a, bdaddr));
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1122 PyObject *ret = NULL;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1123 if (addrobj) {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1124 ret = Py_BuildValue("Oi",
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1125 addrobj,
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1126 _BT_RC_MEMB(a, channel));
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1127 Py_DECREF(addrobj);
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1128 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1129 return ret;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1130 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1131
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1132 case BTPROTO_HCI:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1133 {
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1134 struct sockaddr_hci a = (struct sockaddr_hci ) addr;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1135 PyObject *ret = NULL;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1136 ret = Py_BuildValue("i", _BT_HCI_MEMB(a, dev));
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1137 return ret;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1138 }
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1139
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1140 #if !defined(__FreeBSD__)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1141 case BTPROTO_SCO:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1142 {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1143 struct sockaddr_sco a = (struct sockaddr_sco ) addr;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1144 return makebdaddr(&_BT_SCO_MEMB(a, bdaddr));
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1145 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1146 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1147
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1148 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1149 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1150
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	1151 #ifdef HAVE_NETPACKET_PACKET_H
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1152 case AF_PACKET:
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1153 {
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1154 struct sockaddr_ll a = (struct sockaddr_ll )addr;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1155 char *ifname = "";
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1156 struct ifreq ifr;
16427 c8ef864ba861 fix a couple last-minute bugs in the raw socket support Jeremy Hylton <jeremy@alum.mit.edu> parents: 16410 diff changeset	1157 /* need to look up interface name give index */
c8ef864ba861 fix a couple last-minute bugs in the raw socket support Jeremy Hylton <jeremy@alum.mit.edu> parents: 16410 diff changeset	1158 if (a->sll_ifindex) {
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1159 ifr.ifr_ifindex = a->sll_ifindex;
16427 c8ef864ba861 fix a couple last-minute bugs in the raw socket support Jeremy Hylton <jeremy@alum.mit.edu> parents: 16410 diff changeset	1160 if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1161 ifname = ifr.ifr_name;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1162 }
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1163 return Py_BuildValue("shbhs#",
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1164 ifname,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1165 ntohs(a->sll_protocol),
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1166 a->sll_pkttype,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1167 a->sll_hatype,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1168 a->sll_addr,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1169 a->sll_halen);
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1170 }
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1171 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1172
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1173 /* More cases here... */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1174
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1175 default:
5436 cf818b70da3e In makesockaddr(), if we don't know the address family, don't raise an Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1176 /* If we don't know the address family, don't raise an
cf818b70da3e In makesockaddr(), if we don't know the address family, don't raise an Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1177 exception -- return it as a tuple. */
cf818b70da3e In makesockaddr(), if we don't know the address family, don't raise an Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1178 return Py_BuildValue("is#",
cf818b70da3e In makesockaddr(), if we don't know the address family, don't raise an Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1179 addr->sa_family,
cf818b70da3e In makesockaddr(), if we don't know the address family, don't raise an Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1180 addr->sa_data,
cf818b70da3e In makesockaddr(), if we don't know the address family, don't raise an Guido van Rossum <guido@python.org> parents: 5287 diff changeset	1181 sizeof(addr->sa_data));
925 61143bf03b44 Sometimes, recvfrom() returns an empty address; this is not an error. Guido van Rossum <guido@python.org> parents: 902 diff changeset	1182
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1183 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1184 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1185
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1186
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1187 /* 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	1188 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	1189 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	1190 through len_ret. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1191
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1192 static int
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1193 getsockaddrarg(PySocketSockObject s, PyObject args,
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1194 struct sockaddr addr_ret, int len_ret)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1195 {
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1196 switch (s->sock_family) {
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1197
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	1198 #if defined(AF_UNIX)
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1199 case AF_UNIX:
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1200 {
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	1201 struct sockaddr_un* addr;
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	1202 char *path;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1203 int len;
9307 928ea5a409e5 Use the t# format where appropriate. Greg Stein. Guido van Rossum <guido@python.org> parents: 9203 diff changeset	1204 if (!PyArg_Parse(args, "t#", &path, &len))
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1205 return 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1206
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1207 addr = (struct sockaddr_un*)addr_ret;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1208 #ifdef linux
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1209 if (len > 0 && path[0] == 0) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1210 /* Linux abstract namespace extension */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1211 if (len > sizeof addr->sun_path) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1212 PyErr_SetString(socket_error,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1213 "AF_UNIX path too long");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1214 return 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1215 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1216 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1217 else
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1218 #endif /* linux */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1219 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1220 /* regular NULL-terminated string */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1221 if (len >= sizeof addr->sun_path) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1222 PyErr_SetString(socket_error,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1223 "AF_UNIX path too long");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1224 return 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1225 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1226 addr->sun_path[len] = 0;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1227 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1228 addr->sun_family = s->sock_family;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	1229 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	1230 #if defined(PYOS_OS2)
ca2fb5cf2fd5 Fixes for AF_UNIX support on OS/2: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 31867 diff changeset	1231 len_ret = sizeof(addr);
ca2fb5cf2fd5 Fixes for AF_UNIX support on OS/2: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 31867 diff changeset	1232 #else
3666 556ec82f4d93 Calculate length of AF_UNIX addr struct portably in getsockaddrarg(). Guido van Rossum <guido@python.org> parents: 3665 diff changeset	1233 len_ret = len + sizeof(addr) - sizeof(addr->sun_path);
31896 ca2fb5cf2fd5 Fixes for AF_UNIX support on OS/2: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 31867 diff changeset	1234 #endif
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1235 return 1;
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1236 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1237 #endif /* AF_UNIX */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1238
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1239 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1240 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1241 {
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1242 struct sockaddr_nl* addr;
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1243 int pid, groups;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1244 addr = (struct sockaddr_nl *)addr_ret;
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1245 if (!PyTuple_Check(args)) {
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1246 PyErr_Format(
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1247 PyExc_TypeError,
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1248 "getsockaddrarg: "
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1249 "AF_NETLINK address must be tuple, not %.500s",
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1250 args->ob_type->tp_name);
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1251 return 0;
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1252 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1253 if (!PyArg_ParseTuple(args, "II:getsockaddrarg", &pid, &groups))
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1254 return 0;
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1255 addr->nl_family = AF_NETLINK;
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1256 addr->nl_pid = pid;
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1257 addr->nl_groups = groups;
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1258 len_ret = sizeof(addr);
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1259 return 1;
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1260 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1261 #endif
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1262
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1263 case AF_INET:
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1264 {
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	1265 struct sockaddr_in* addr;
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	1266 char *host;
30081 7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	1267 int port, result;
15466 9731bbb52fb4 Patch by Michael Hudson to clarify the error message from Guido van Rossum <guido@python.org> parents: 15046 diff changeset	1268 if (!PyTuple_Check(args)) {
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1269 PyErr_Format(
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1270 PyExc_TypeError,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1271 "getsockaddrarg: "
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1272 "AF_INET address must be tuple, not %.500s",
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1273 args->ob_type->tp_name);
15466 9731bbb52fb4 Patch by Michael Hudson to clarify the error message from Guido van Rossum <guido@python.org> parents: 15046 diff changeset	1274 return 0;
9731bbb52fb4 Patch by Michael Hudson to clarify the error message from Guido van Rossum <guido@python.org> parents: 15046 diff changeset	1275 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1276 if (!PyArg_ParseTuple(args, "eti:getsockaddrarg",
28671 d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	1277 "idna", &host, &port))
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1278 return 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1279 addr=(struct sockaddr_in*)addr_ret;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1280 result = setipaddr(host, (struct sockaddr *)addr,
30081 7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	1281 sizeof(*addr), AF_INET);
7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	1282 PyMem_Free(host);
7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	1283 if (result < 0)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1284 return 0;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	1285 addr->sin_family = AF_INET;
5287 5af766a1b531 Tweaks to keep the Microsoft compiler quier. Guido van Rossum <guido@python.org> parents: 4871 diff changeset	1286 addr->sin_port = htons((short)port);
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	1287 len_ret = sizeof addr;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1288 return 1;
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1289 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1290
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1291 #ifdef ENABLE_IPV6
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1292 case AF_INET6:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1293 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1294 struct sockaddr_in6* addr;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1295 char *host;
30081 7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	1296 int port, flowinfo, scope_id, result;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1297 flowinfo = scope_id = 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1298 if (!PyTuple_Check(args)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1299 PyErr_Format(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1300 PyExc_TypeError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1301 "getsockaddrarg: "
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1302 "AF_INET6 address must be tuple, not %.500s",
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1303 args->ob_type->tp_name);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1304 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1305 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1306 if (!PyArg_ParseTuple(args, "eti\|ii",
28671 d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	1307 "idna", &host, &port, &flowinfo,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1308 &scope_id)) {
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1309 return 0;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1310 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1311 addr = (struct sockaddr_in6*)addr_ret;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1312 result = setipaddr(host, (struct sockaddr *)addr,
30081 7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	1313 sizeof(*addr), AF_INET6);
7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	1314 PyMem_Free(host);
7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	1315 if (result < 0)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1316 return 0;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1317 addr->sin6_family = s->sock_family;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1318 addr->sin6_port = htons((short)port);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1319 addr->sin6_flowinfo = flowinfo;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1320 addr->sin6_scope_id = scope_id;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1321 len_ret = sizeof addr;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1322 return 1;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1323 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1324 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1325
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1326 #ifdef USE_BLUETOOTH
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1327 case AF_BLUETOOTH:
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1328 {
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1329 switch (s->sock_proto) {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1330 case BTPROTO_L2CAP:
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1331 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1332 struct sockaddr_l2 *addr;
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1333 char *straddr;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1334
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1335 addr = (struct sockaddr_l2 *)addr_ret;
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1336 _BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1337 if (!PyArg_ParseTuple(args, "si", &straddr,
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1338 &_BT_L2_MEMB(addr, psm))) {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1339 PyErr_SetString(socket_error, "getsockaddrarg: "
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1340 "wrong format");
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1341 return 0;
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1342 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1343 if (setbdaddr(straddr, &_BT_L2_MEMB(addr, bdaddr)) < 0)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1344 return 0;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1345
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1346 len_ret = sizeof addr;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1347 return 1;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1348 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1349 case BTPROTO_RFCOMM:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1350 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1351 struct sockaddr_rc *addr;
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1352 char *straddr;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1353
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1354 addr = (struct sockaddr_rc *)addr_ret;
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1355 _BT_RC_MEMB(addr, family) = AF_BLUETOOTH;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1356 if (!PyArg_ParseTuple(args, "si", &straddr,
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1357 &_BT_RC_MEMB(addr, channel))) {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1358 PyErr_SetString(socket_error, "getsockaddrarg: "
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1359 "wrong format");
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1360 return 0;
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1361 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1362 if (setbdaddr(straddr, &_BT_RC_MEMB(addr, bdaddr)) < 0)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1363 return 0;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1364
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1365 len_ret = sizeof addr;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1366 return 1;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1367 }
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1368 case BTPROTO_HCI:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1369 {
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1370 struct sockaddr_hci addr = (struct sockaddr_hci )addr_ret;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1371 _BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1372 if (!PyArg_ParseTuple(args, "i", &_BT_HCI_MEMB(addr, dev))) {
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1373 PyErr_SetString(socket_error, "getsockaddrarg: "
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1374 "wrong format");
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1375 return 0;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1376 }
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1377 len_ret = sizeof addr;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1378 return 1;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1379 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1380 #if !defined(__FreeBSD__)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1381 case BTPROTO_SCO:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1382 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1383 struct sockaddr_sco *addr;
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1384 char *straddr;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1385
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1386 addr = (struct sockaddr_sco *)addr_ret;
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1387 _BT_SCO_MEMB(addr, family) = AF_BLUETOOTH;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1388 straddr = PyString_AsString(args);
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1389 if (straddr == NULL) {
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1390 PyErr_SetString(socket_error, "getsockaddrarg: "
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1391 "wrong format");
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1392 return 0;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1393 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1394 if (setbdaddr(straddr, &_BT_SCO_MEMB(addr, bdaddr)) < 0)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1395 return 0;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1396
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1397 len_ret = sizeof addr;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1398 return 1;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1399 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1400 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1401 default:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1402 PyErr_SetString(socket_error, "getsockaddrarg: unknown Bluetooth protocol");
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1403 return 0;
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1404 }
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1405 }
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1406 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1407
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	1408 #ifdef HAVE_NETPACKET_PACKET_H
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1409 case AF_PACKET:
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1410 {
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1411 struct sockaddr_ll* addr;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1412 struct ifreq ifr;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1413 char *interfaceName;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1414 int protoNumber;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1415 int hatype = 0;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1416 int pkttype = 0;
32611 8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1417 char *haddr = NULL;
8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1418 unsigned int halen = 0;
8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1419
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1420 if (!PyTuple_Check(args)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1421 PyErr_Format(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1422 PyExc_TypeError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1423 "getsockaddrarg: "
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1424 "AF_PACKET address must be tuple, not %.500s",
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1425 args->ob_type->tp_name);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1426 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1427 }
32611 8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1428 if (!PyArg_ParseTuple(args, "si\|iis#", &interfaceName,
8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1429 &protoNumber, &pkttype, &hatype,
8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1430 &haddr, &halen))
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1431 return 0;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1432 strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1433 ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
16427 c8ef864ba861 fix a couple last-minute bugs in the raw socket support Jeremy Hylton <jeremy@alum.mit.edu> parents: 16410 diff changeset	1434 if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
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	1435 s->errorhandler();
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1436 return 0;
16427 c8ef864ba861 fix a couple last-minute bugs in the raw socket support Jeremy Hylton <jeremy@alum.mit.edu> parents: 16410 diff changeset	1437 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1438 if (halen > 8) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1439 PyErr_SetString(PyExc_ValueError,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1440 "Hardware address must be 8 bytes or less");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1441 return 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1442 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1443 addr = (struct sockaddr_ll*)addr_ret;
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1444 addr->sll_family = AF_PACKET;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1445 addr->sll_protocol = htons((short)protoNumber);
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1446 addr->sll_ifindex = ifr.ifr_ifindex;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1447 addr->sll_pkttype = pkttype;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1448 addr->sll_hatype = hatype;
32611 8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1449 if (halen != 0) {
8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1450 memcpy(&addr->sll_addr, haddr, halen);
8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1451 }
8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	1452 addr->sll_halen = halen;
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1453 len_ret = sizeof addr;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1454 return 1;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1455 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1456 #endif
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1457
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1458 /* More cases here... */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1459
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1460 default:
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	1461 PyErr_SetString(socket_error, "getsockaddrarg: bad family");
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1462 return 0;
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1463
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1464 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1465 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1466
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1467
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1468 /* 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	1469 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	1470 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	1471
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1472 static int
13554 906efc1da247 Errare humanum est. Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13538 diff changeset	1473 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	1474 {
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1475 switch (s->sock_family) {
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1476
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	1477 #if defined(AF_UNIX)
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1478 case AF_UNIX:
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1479 {
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1480 *len_ret = sizeof (struct sockaddr_un);
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1481 return 1;
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1482 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1483 #endif /* AF_UNIX */
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1484 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1485 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1486 {
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1487 *len_ret = sizeof (struct sockaddr_nl);
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1488 return 1;
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1489 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1490 #endif
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1491
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1492 case AF_INET:
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1493 {
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1494 *len_ret = sizeof (struct sockaddr_in);
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1495 return 1;
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1496 }
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1497
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1498 #ifdef ENABLE_IPV6
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1499 case AF_INET6:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1500 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1501 *len_ret = sizeof (struct sockaddr_in6);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1502 return 1;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1503 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1504 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1505
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1506 #ifdef USE_BLUETOOTH
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1507 case AF_BLUETOOTH:
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1508 {
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1509 switch(s->sock_proto)
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1510 {
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1511
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1512 case BTPROTO_L2CAP:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1513 *len_ret = sizeof (struct sockaddr_l2);
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1514 return 1;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1515 case BTPROTO_RFCOMM:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1516 *len_ret = sizeof (struct sockaddr_rc);
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1517 return 1;
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1518 case BTPROTO_HCI:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1519 *len_ret = sizeof (struct sockaddr_hci);
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1520 return 1;
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1521 #if !defined(__FreeBSD__)
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1522 case BTPROTO_SCO:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1523 *len_ret = sizeof (struct sockaddr_sco);
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1524 return 1;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1525 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1526 default:
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1527 PyErr_SetString(socket_error, "getsockaddrlen: "
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1528 "unknown BT protocol");
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1529 return 0;
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1530
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1531 }
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1532 }
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1533 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1534
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	1535 #ifdef HAVE_NETPACKET_PACKET_H
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1536 case AF_PACKET:
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1537 {
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1538 *len_ret = sizeof (struct sockaddr_ll);
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1539 return 1;
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1540 }
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1541 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1542
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1543 /* More cases here... */
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1544
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1545 default:
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	1546 PyErr_SetString(socket_error, "getsockaddrlen: bad family");
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1547 return 0;
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1548
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1549 }
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1550 }
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1551
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1552
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1553 /* s.accept() method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1554
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1555 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	1556 sock_accept(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1557 {
35551 57f630a9de26 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35452 diff changeset	1558 sock_addr_t addrbuf;
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	1559 SOCKET_T newfd = INVALID_SOCKET;
12479 a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	1560 socklen_t addrlen;
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1561 PyObject *sock = NULL;
a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1562 PyObject *addr = NULL;
a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1563 PyObject *res = NULL;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1564 int timeout;
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 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 if (!getsockaddrlen(s, &addrlen))
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1567 return NULL;
35551 57f630a9de26 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35452 diff changeset	1568 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	1569
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	1570 if (!IS_SELECTABLE(s))
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	1571 return select_error();
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	1572
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1573 Py_BEGIN_ALLOW_THREADS
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1574 timeout = internal_select(s, 0);
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1575 if (!timeout)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1576 newfd = accept(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1577 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	1578
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1579 if (timeout == 1) {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1580 PyErr_SetString(socket_timeout, "timed out");
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1581 return NULL;
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1582 }
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1583
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	1584 if (newfd == INVALID_SOCKET)
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	1585 return s->errorhandler();
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1586
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1587 /* Create the new object with unspecified family,
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1588 to avoid calls to bind() etc. on it. */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	1589 sock = (PyObject *) new_sockobject(newfd,
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	1590 s->sock_family,
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	1591 s->sock_type,
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	1592 s->sock_proto);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1593
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1594 if (sock == NULL) {
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	1595 SOCKETCLOSE(newfd);
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1596 goto finally;
a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1597 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1598 addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1599 addrlen, s->sock_proto);
16427 c8ef864ba861 fix a couple last-minute bugs in the raw socket support Jeremy Hylton <jeremy@alum.mit.edu> parents: 16410 diff changeset	1600 if (addr == NULL)
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1601 goto finally;
a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1602
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30646 diff changeset	1603 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	1604
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1605 finally:
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1606 Py_XDECREF(sock);
84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1607 Py_XDECREF(addr);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1608 return res;
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1609 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1610
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1611 PyDoc_STRVAR(accept_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1612 "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	1613 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1614 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	1615 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	1616 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	1617
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1618 /* s.setblocking(flag) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1619 False -- non-blocking mode; same as settimeout(0)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1620 True -- blocking mode; same as settimeout(None)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1621 */
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	1622
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1623 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	1624 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	1625 {
758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	1626 int block;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1627
20376 061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	1628 block = PyInt_AsLong(arg);
061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	1629 if (block == -1 && PyErr_Occurred())
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	1630 return NULL;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1631
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1632 s->sock_timeout = block ? -1.0 : 0.0;
23727 9d11f51860dd I decided to change the interaction between setblocking() and Guido van Rossum <guido@python.org> parents: 23725 diff changeset	1633 internal_setblocking(s, block);
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	1634
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1635 Py_INCREF(Py_None);
84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1636 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	1637 }
758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	1638
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1639 PyDoc_STRVAR(setblocking_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1640 "setblocking(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1641 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1642 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	1643 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	1644 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	1645
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1646 /* s.settimeout(timeout) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1647 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	1648 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	1649 > 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	1650 < 0 -- illegal; raises an exception
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1651 */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1652 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	1653 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	1654 {
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1655 double timeout;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1656
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1657 if (arg == Py_None)
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1658 timeout = -1.0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1659 else {
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1660 timeout = PyFloat_AsDouble(arg);
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1661 if (timeout < 0.0) {
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1662 if (!PyErr_Occurred())
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1663 PyErr_SetString(PyExc_ValueError,
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1664 "Timeout value out of range");
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1665 return NULL;
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1666 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1667 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1668
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1669 s->sock_timeout = timeout;
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1670 internal_setblocking(s, timeout < 0.0);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1671
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1672 Py_INCREF(Py_None);
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1673 return Py_None;
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1674 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1675
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1676 PyDoc_STRVAR(settimeout_doc,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1677 "settimeout(timeout)\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1678 \n\
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1679 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	1680 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	1681 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	1682 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	1683
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1684 /* s.gettimeout() method.
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1685 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	1686 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	1687 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	1688 {
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1689 if (s->sock_timeout < 0.0) {
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1690 Py_INCREF(Py_None);
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1691 return Py_None;
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1692 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1693 else
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1694 return PyFloat_FromDouble(s->sock_timeout);
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1695 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1696
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1697 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	1698 "gettimeout() -> timeout\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1699 \n\
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1700 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	1701 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	1702 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	1703
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1704 #ifdef RISCOS
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1705 /* s.sleeptaskw(1 \| 0) method */
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1706
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1707 static PyObject *
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	1708 sock_sleeptaskw(PySocketSockObject s,PyObject arg)
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1709 {
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1710 int block;
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	1711 block = PyInt_AsLong(arg);
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	1712 if (block == -1 && PyErr_Occurred())
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1713 return NULL;
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1714 Py_BEGIN_ALLOW_THREADS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1715 socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1716 Py_END_ALLOW_THREADS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1717
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1718 Py_INCREF(Py_None);
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1719 return Py_None;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1720 }
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1721 PyDoc_STRVAR(sleeptaskw_doc,
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1722 "sleeptaskw(flag)\n\
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1723 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1724 Allow sleeps in taskwindows.");
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1725 #endif
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1726
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1727
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	1728 /* 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	1729 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	1730 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	1731 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	1732
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1733 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	1734 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	1735 {
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1736 int level;
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1737 int optname;
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	1738 int res;
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	1739 char *buf;
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	1740 int buflen;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1741 int flag;
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1742
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	1743 if (PyArg_ParseTuple(args, "iii:setsockopt",
b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	1744 &level, &optname, &flag)) {
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	1745 buf = (char *) &flag;
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	1746 buflen = sizeof flag;
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	1747 }
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	1748 else {
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1749 PyErr_Clear();
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	1750 if (!PyArg_ParseTuple(args, "iis#:setsockopt",
b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	1751 &level, &optname, &buf, &buflen))
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	1752 return NULL;
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	1753 }
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13695 diff changeset	1754 res = setsockopt(s->sock_fd, level, optname, (void *)buf, buflen);
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1755 if (res < 0)
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	1756 return s->errorhandler();
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1757 Py_INCREF(Py_None);
84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1758 return Py_None;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1759 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1760
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1761 PyDoc_STRVAR(setsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1762 "setsockopt(level, option, value)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1763 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1764 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	1765 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	1766
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1767
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	1768 /* 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	1769 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	1770 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	1771 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	1772
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 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_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	1775 {
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1776 int level;
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1777 int optname;
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	1778 int res;
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1779 PyObject *buf;
12479 a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	1780 socklen_t buflen = 0;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1781
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1782 #ifdef __BEOS__
17806 3380279612a3 Fix a minor style consistency issue. Fred Drake <fdrake@acm.org> parents: 17737 diff changeset	1783 /* We have incomplete socket support. */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	1784 PyErr_SetString(socket_error, "getsockopt not supported");
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1785 return NULL;
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1786 #else
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1787
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	1788 if (!PyArg_ParseTuple(args, "ii\|i:getsockopt",
b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	1789 &level, &optname, &buflen))
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	1790 return NULL;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1791
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	1792 if (buflen == 0) {
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	1793 int flag = 0;
12479 a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	1794 socklen_t flagsize = sizeof flag;
1413 c914b10bf2ed * timemodule.c: Add hack for Solaris 2. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	1795 res = getsockopt(s->sock_fd, level, optname,
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13695 diff changeset	1796 (void *)&flag, &flagsize);
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	1797 if (res < 0)
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	1798 return s->errorhandler();
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1799 return PyInt_FromLong(flag);
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	1800 }
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	1801 #ifdef __VMS
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1802 /* socklen_t is unsigned so no negative test is needed,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1803 test buflen == 0 is previously done */
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	1804 if (buflen > 1024) {
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	1805 #else
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	1806 if (buflen <= 0 \|\| buflen > 1024) {
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	1807 #endif
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	1808 PyErr_SetString(socket_error,
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1809 "getsockopt buflen out of range");
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	1810 return NULL;
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	1811 }
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	1812 buf = PyBytes_FromStringAndSize((char *)NULL, buflen);
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	1813 if (buf == NULL)
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	1814 return NULL;
1413 c914b10bf2ed * timemodule.c: Add hack for Solaris 2. Guido van Rossum <guido@python.org> parents: 1313 diff changeset	1815 res = getsockopt(s->sock_fd, level, optname,
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	1816 (void *)PyBytes_AS_STRING(buf), &buflen);
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	1817 if (res < 0) {
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1818 Py_DECREF(buf);
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	1819 return s->errorhandler();
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	1820 }
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	1821 if (PyBytes_Resize(buf, buflen) < 0) {
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	1822 Py_DECREF(buf);
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	1823 return NULL;
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	1824 }
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	1825 return buf;
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1826 #endif /* __BEOS__ */
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1827 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1828
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1829 PyDoc_STRVAR(getsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1830 "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	1831 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1832 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	1833 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	1834 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	1835
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1836
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	1837 /* s.bind(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1838
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1839 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	1840 sock_bind(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1841 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1842 sock_addr_t addrbuf;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1843 int addrlen;
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	1844 int res;
20376 061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	1845
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1846 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1847 return NULL;
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1848 Py_BEGIN_ALLOW_THREADS
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1849 res = bind(s->sock_fd, SAS2SA(&addrbuf), addrlen);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1850 Py_END_ALLOW_THREADS
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	1851 if (res < 0)
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	1852 return s->errorhandler();
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1853 Py_INCREF(Py_None);
84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1854 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1855 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1856
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1857 PyDoc_STRVAR(bind_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1858 "bind(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1859 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1860 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	1861 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	1862 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	1863
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1864
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1865 /* s.close() method.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1866 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	1867 will surely fail. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1868
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1869 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	1870 sock_close(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1871 {
15604 15e1eb1019b8 Adapted from a patch by Barry Scott, SF patch #102875 and SF bug Guido van Rossum <guido@python.org> parents: 15466 diff changeset	1872 SOCKET_T fd;
20376 061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	1873
15604 15e1eb1019b8 Adapted from a patch by Barry Scott, SF patch #102875 and SF bug Guido van Rossum <guido@python.org> parents: 15466 diff changeset	1874 if ((fd = s->sock_fd) != -1) {
15e1eb1019b8 Adapted from a patch by Barry Scott, SF patch #102875 and SF bug Guido van Rossum <guido@python.org> parents: 15466 diff changeset	1875 s->sock_fd = -1;
4407 7ddd8b3f6802 Don't close an already closed socket. Guido van Rossum <guido@python.org> parents: 3738 diff changeset	1876 Py_BEGIN_ALLOW_THREADS
15604 15e1eb1019b8 Adapted from a patch by Barry Scott, SF patch #102875 and SF bug Guido van Rossum <guido@python.org> parents: 15466 diff changeset	1877 (void) SOCKETCLOSE(fd);
4407 7ddd8b3f6802 Don't close an already closed socket. Guido van Rossum <guido@python.org> parents: 3738 diff changeset	1878 Py_END_ALLOW_THREADS
7ddd8b3f6802 Don't close an already closed socket. Guido van Rossum <guido@python.org> parents: 3738 diff changeset	1879 }
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1880 Py_INCREF(Py_None);
84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1881 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1882 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1883
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1884 PyDoc_STRVAR(close_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1885 "close()\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1886 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1887 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	1888
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1889 static int
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1890 internal_connect(PySocketSockObject s, struct sockaddr addr, int addrlen,
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1891 int *timeoutp)
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1892 {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1893 int res, timeout;
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1894
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1895 timeout = 0;
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1896 res = connect(s->sock_fd, addr, addrlen);
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1897
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1898 #ifdef MS_WINDOWS
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1899
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1900 if (s->sock_timeout > 0.0) {
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	1901 if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK &&
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	1902 IS_SELECTABLE(s)) {
27981 eb2a984d3747 The connect timeout code wasn't working on Windows. Guido van Rossum <guido@python.org> parents: 27861 diff changeset	1903 /* This is a mess. Best solution: trust select */
eb2a984d3747 The connect timeout code wasn't working on Windows. Guido van Rossum <guido@python.org> parents: 27861 diff changeset	1904 fd_set fds;
32909 65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1905 fd_set fds_exc;
27981 eb2a984d3747 The connect timeout code wasn't working on Windows. Guido van Rossum <guido@python.org> parents: 27861 diff changeset	1906 struct timeval tv;
eb2a984d3747 The connect timeout code wasn't working on Windows. Guido van Rossum <guido@python.org> parents: 27861 diff changeset	1907 tv.tv_sec = (int)s->sock_timeout;
eb2a984d3747 The connect timeout code wasn't working on Windows. Guido van Rossum <guido@python.org> parents: 27861 diff changeset	1908 tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
eb2a984d3747 The connect timeout code wasn't working on Windows. Guido van Rossum <guido@python.org> parents: 27861 diff changeset	1909 FD_ZERO(&fds);
eb2a984d3747 The connect timeout code wasn't working on Windows. Guido van Rossum <guido@python.org> parents: 27861 diff changeset	1910 FD_SET(s->sock_fd, &fds);
32909 65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1911 FD_ZERO(&fds_exc);
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1912 FD_SET(s->sock_fd, &fds_exc);
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1913 res = select(s->sock_fd+1, NULL, &fds, &fds_exc, &tv);
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1914 if (res == 0) {
27981 eb2a984d3747 The connect timeout code wasn't working on Windows. Guido van Rossum <guido@python.org> parents: 27861 diff changeset	1915 res = WSAEWOULDBLOCK;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1916 timeout = 1;
32909 65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1917 } else if (res > 0) {
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1918 if (FD_ISSET(s->sock_fd, &fds))
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1919 /* The socket is in the writeable set - this
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1920 means connected */
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1921 res = 0;
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1922 else {
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1923 /* As per MS docs, we need to call getsockopt()
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1924 to get the underlying error */
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1925 int res_size = sizeof res;
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1926 /* It must be in the exception set */
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1927 assert(FD_ISSET(s->sock_fd, &fds_exc));
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1928 if (0 == getsockopt(s->sock_fd, SOL_SOCKET, SO_ERROR,
32909 65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1929 (char *)&res, &res_size))
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1930 /* getsockopt also clears WSAGetLastError,
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1931 so reset it back. */
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1932 WSASetLastError(res);
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1933 else
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1934 res = WSAGetLastError();
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1935 }
65319607bed8 Fix [ 1001018 ]: Windows: setdefaulttimeout causes unnecessary timeouts on Mark Hammond <mhammond@skippinet.com.au> parents: 32764 diff changeset	1936 }
27981 eb2a984d3747 The connect timeout code wasn't working on Windows. Guido van Rossum <guido@python.org> parents: 27861 diff changeset	1937 /* else if (res < 0) an error occurred */
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1938 }
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1939 }
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1940
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1941 if (res < 0)
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1942 res = WSAGetLastError();
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1943
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1944 #else
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1945
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1946 if (s->sock_timeout > 0.0) {
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	1947 if (res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1948 timeout = internal_select(s, 1);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1949 if (timeout == 0) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1950 res = connect(s->sock_fd, addr, addrlen);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1951 if (res < 0 && errno == EISCONN)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1952 res = 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1953 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1954 else if (timeout == -1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1955 res = errno; /* had error */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1956 else
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1957 res = EWOULDBLOCK; /* timed out */
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1958 }
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1959 }
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1960
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1961 if (res < 0)
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1962 res = errno;
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1963
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1964 #endif
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1965 *timeoutp = timeout;
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1966
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1967 return res;
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1968 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1969
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	1970 /* s.connect(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1971
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1972 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	1973 sock_connect(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1974 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1975 sock_addr_t addrbuf;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1976 int addrlen;
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	1977 int res;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1978 int timeout;
20376 061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	1979
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1980 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1981 return NULL;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1982
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1983 Py_BEGIN_ALLOW_THREADS
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1984 res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1985 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	1986
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1987 if (timeout == 1) {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1988 PyErr_SetString(socket_timeout, "timed out");
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1989 return NULL;
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1990 }
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1991 if (res != 0)
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	1992 return s->errorhandler();
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1993 Py_INCREF(Py_None);
84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1994 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1995 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1996
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1997 PyDoc_STRVAR(connect_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1998 "connect(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1999 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2000 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	2001 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	2002
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2003
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2004 /* 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	2005
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2006 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	2007 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	2008 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2009 sock_addr_t addrbuf;
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2010 int addrlen;
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2011 int res;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2012 int timeout;
20376 061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	2013
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2014 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2015 return NULL;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2016
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2017 Py_BEGIN_ALLOW_THREADS
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2018 res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2019 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	2020
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2021 /* Signals are not errors (though they may raise exceptions). Adapted
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2022 from PyErr_SetFromErrnoWithFilenameObject(). */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2023 #ifdef EINTR
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2024 if (res == EINTR && PyErr_CheckSignals())
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2025 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2026 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2027
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2028 return PyInt_FromLong((long) res);
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2029 }
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2030
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2031 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	2032 "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	2033 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2034 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	2035 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	2036
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2037
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	2038 /* 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	2039
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2040 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	2041 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	2042 {
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2043 #if SIZEOF_SOCKET_T <= SIZEOF_LONG
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2044 return PyInt_FromLong((long) s->sock_fd);
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2045 #else
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 27981 diff changeset	2046 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	2047 #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	2048 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2049
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2050 PyDoc_STRVAR(fileno_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2051 "fileno() -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2052 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2053 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	2054
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	2055
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	2056 #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	2057 /* 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	2058
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	2059 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2060 sock_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	2061 {
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2062 SOCKET_T newfd;
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	2063 PyObject *sock;
20376 061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	2064
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	2065 newfd = dup(s->sock_fd);
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	2066 if (newfd < 0)
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	2067 return s->errorhandler();
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2068 sock = (PyObject *) new_sockobject(newfd,
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2069 s->sock_family,
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2070 s->sock_type,
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2071 s->sock_proto);
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	2072 if (sock == NULL)
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	2073 SOCKETCLOSE(newfd);
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	2074 return sock;
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	2075 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2076
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2077 PyDoc_STRVAR(dup_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2078 "dup() -> socket object\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2079 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2080 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	2081
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	2082 #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	2083
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	2084
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2085 /* s.getsockname() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2086
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2087 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	2088 sock_getsockname(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2089 {
35551 57f630a9de26 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35452 diff changeset	2090 sock_addr_t addrbuf;
12479 a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	2091 int res;
a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	2092 socklen_t addrlen;
a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	2093
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2094 if (!getsockaddrlen(s, &addrlen))
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2095 return NULL;
35551 57f630a9de26 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35452 diff changeset	2096 memset(&addrbuf, 0, addrlen);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2097 Py_BEGIN_ALLOW_THREADS
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2098 res = getsockname(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2099 Py_END_ALLOW_THREADS
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2100 if (res < 0)
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	2101 return s->errorhandler();
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2102 return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	2103 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2104 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2105
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2106 PyDoc_STRVAR(getsockname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2107 "getsockname() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2108 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2109 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	2110 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	2111
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2112
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2113 #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	2114 /* s.getpeername() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2115
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2116 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	2117 sock_getpeername(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2118 {
35551 57f630a9de26 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35452 diff changeset	2119 sock_addr_t addrbuf;
12479 a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	2120 int res;
a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	2121 socklen_t addrlen;
a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	2122
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2123 if (!getsockaddrlen(s, &addrlen))
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2124 return NULL;
35551 57f630a9de26 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35452 diff changeset	2125 memset(&addrbuf, 0, addrlen);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2126 Py_BEGIN_ALLOW_THREADS
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2127 res = getpeername(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2128 Py_END_ALLOW_THREADS
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2129 if (res < 0)
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	2130 return s->errorhandler();
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2131 return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	2132 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2133 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2134
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2135 PyDoc_STRVAR(getpeername_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2136 "getpeername() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2137 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2138 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	2139 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	2140
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2141 #endif /* HAVE_GETPEERNAME */
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2142
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2143
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2144 /* s.listen(n) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2145
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2146 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	2147 sock_listen(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2148 {
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2149 int backlog;
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2150 int res;
20376 061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	2151
061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	2152 backlog = PyInt_AsLong(arg);
061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	2153 if (backlog == -1 && PyErr_Occurred())
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2154 return NULL;
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2155 Py_BEGIN_ALLOW_THREADS
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2156 if (backlog < 1)
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2157 backlog = 1;
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2158 res = listen(s->sock_fd, backlog);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2159 Py_END_ALLOW_THREADS
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2160 if (res < 0)
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	2161 return s->errorhandler();
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2162 Py_INCREF(Py_None);
84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2163 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2164 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2165
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2166 PyDoc_STRVAR(listen_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2167 "listen(backlog)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2168 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2169 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	2170 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	2171 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	2172
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2173
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2174 /*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2175 * This is the guts of the recv() and recv_into() methods, which reads into a
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	2176 * char buffer. If you have any inc/dec ref to do to the objects that contain
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2177 * the buffer, do it in the caller. This function returns the number of bytes
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2178 * succesfully read. If there was an error, it returns -1. Note that it is
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2179 * also possible that we return a number of bytes smaller than the request
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2180 * bytes.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2181 */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2182 static ssize_t
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2183 sock_recv_guts(PySocketSockObject s, char cbuf, int len, int flags)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2184 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2185 ssize_t outlen = -1;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2186 int timeout;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2187 #ifdef __VMS
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2188 int remaining;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2189 char *read_buf;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2190 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2191
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2192 if (!IS_SELECTABLE(s)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2193 select_error();
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2194 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2195 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2196
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2197 #ifndef __VMS
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2198 Py_BEGIN_ALLOW_THREADS
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2199 timeout = internal_select(s, 0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2200 if (!timeout)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2201 outlen = recv(s->sock_fd, cbuf, len, flags);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2202 Py_END_ALLOW_THREADS
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2203
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2204 if (timeout == 1) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2205 PyErr_SetString(socket_timeout, "timed out");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2206 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2207 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2208 if (outlen < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2209 /* Note: the call to errorhandler() ALWAYS indirectly returned
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2210 NULL, so ignore its return value */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2211 s->errorhandler();
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2212 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2213 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2214 #else
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2215 read_buf = cbuf;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2216 remaining = len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2217 while (remaining != 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2218 unsigned int segment;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2219 int nread = -1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2220
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2221 segment = remaining /SEGMENT_SIZE;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2222 if (segment != 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2223 segment = SEGMENT_SIZE;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2224 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2225 else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2226 segment = remaining;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2227 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2228
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2229 Py_BEGIN_ALLOW_THREADS
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2230 timeout = internal_select(s, 0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2231 if (!timeout)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2232 nread = recv(s->sock_fd, read_buf, segment, flags);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2233 Py_END_ALLOW_THREADS
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2234
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2235 if (timeout == 1) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2236 PyErr_SetString(socket_timeout, "timed out");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2237 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2238 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2239 if (nread < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2240 s->errorhandler();
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2241 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2242 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2243 if (nread != remaining) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2244 read_buf += nread;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2245 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2246 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2247
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2248 remaining -= segment;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2249 read_buf += segment;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2250 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2251 outlen = read_buf - cbuf;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2252 #endif /* !__VMS */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2253
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2254 return outlen;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2255 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2256
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	2257
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	2258 /* 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	2259
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2260 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	2261 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	2262 {
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2263 int recvlen, flags = 0;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2264 ssize_t outlen;
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2265 PyObject *buf;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2266
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2267 if (!PyArg_ParseTuple(args, "i\|i:recv", &recvlen, &flags))
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	2268 return NULL;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2269
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2270 if (recvlen < 0) {
21022 9f66aaddf8d4 Test for negative buffer sizes. Fixes #482871. Martin v. Löwis <martin@v.loewis.de> parents: 20920 diff changeset	2271 PyErr_SetString(PyExc_ValueError,
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2272 "negative buffersize in recv");
21022 9f66aaddf8d4 Test for negative buffer sizes. Fixes #482871. Martin v. Löwis <martin@v.loewis.de> parents: 20920 diff changeset	2273 return NULL;
9f66aaddf8d4 Test for negative buffer sizes. Fixes #482871. Martin v. Löwis <martin@v.loewis.de> parents: 20920 diff changeset	2274 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2275
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2276 /* Allocate a new string. */
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2277 buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2278 if (buf == NULL)
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2279 return NULL;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2280
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2281 /* Call the guts */
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2282 outlen = sock_recv_guts(s, PyBytes_AS_STRING(buf), recvlen, flags);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2283 if (outlen < 0) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2284 /* An error occurred, release the string and return an
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2285 error. */
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2286 Py_DECREF(buf);
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2287 return NULL;
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2288 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2289 if (outlen != recvlen) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2290 /* We did not read as many bytes as we anticipated, resize the
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2291 string if possible and be succesful. */
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2292 if (PyBytes_Resize(buf, outlen) < 0)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2293 /* Oopsy, not so succesful after all. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2294 return NULL;
3091 7ddfb629ac3f plug some leaks Guido van Rossum <guido@python.org> parents: 2736 diff changeset	2295 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2296
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2297 return buf;
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2298 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2299
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2300 PyDoc_STRVAR(recv_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2301 "recv(buffersize[, flags]) -> data\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2302 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2303 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	2304 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	2305 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	2306 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	2307
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2308
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2309 /* s.recv_into(buffer, [nbytes [,flags]]) method */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2310
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2311 static PyObject*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2312 sock_recv_into(PySocketSockObject s, PyObject args, PyObject *kwds)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2313 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2314 static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2315
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2316 int recvlen = 0, flags = 0;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2317 ssize_t readlen;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2318 char *buf;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2319 int buflen;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2320
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2321 /* Get the buffer's memory */
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2322 if (!PyArg_ParseTupleAndKeywords(args, kwds, "w#\|ii:recv_into", kwlist,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2323 &buf, &buflen, &recvlen, &flags))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2324 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2325 assert(buf != 0 && buflen > 0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2326
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2327 if (recvlen < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2328 PyErr_SetString(PyExc_ValueError,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2329 "negative buffersize in recv_into");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2330 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2331 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2332 if (recvlen == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2333 /* If nbytes was not specified, use the buffer's length */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2334 recvlen = buflen;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2335 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2336
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2337 /* Check if the buffer is large enough */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2338 if (buflen < recvlen) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2339 PyErr_SetString(PyExc_ValueError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2340 "buffer too small for requested bytes");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2341 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2342 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2343
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2344 /* Call the guts */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2345 readlen = sock_recv_guts(s, buf, recvlen, flags);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2346 if (readlen < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2347 /* Return an error. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2348 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2349 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2350
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2351 /* Return the number of bytes read. Note that we do not do anything
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2352 special here in the case that readlen < recvlen. */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2353 return PyInt_FromSsize_t(readlen);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2354 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2355
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2356 PyDoc_STRVAR(recv_into_doc,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2357 "recv_into(buffer, [nbytes[, flags]]) -> nbytes_read\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2358 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2359 A version of recv() that stores its data into a buffer rather than creating \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2360 a new string. Receive up to buffersize bytes from the socket. If buffersize \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2361 is not specified (or 0), receive up to the size available in the given buffer.\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2362 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2363 See recv() for documentation about the flags.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2364
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2365
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2366 /*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2367 * This is the guts of the recv() and recv_into() methods, which reads into a
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2368 * char buffer. If you have any inc/def ref to do to the objects that contain
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2369 * the buffer, do it in the caller. This function returns the number of bytes
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2370 * succesfully read. If there was an error, it returns -1. Note that it is
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2371 * also possible that we return a number of bytes smaller than the request
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2372 * bytes.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2373 *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2374 * 'addr' is a return value for the address object. Note that you must decref
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2375 * it yourself.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2376 */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2377 static ssize_t
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2378 sock_recvfrom_guts(PySocketSockObject s, char cbuf, int len, int flags,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2379 PyObject** addr)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2380 {
35551 57f630a9de26 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35452 diff changeset	2381 sock_addr_t addrbuf;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2382 int timeout;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2383 ssize_t n = -1;
12479 a3e1fecb43c6 Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the Guido van Rossum <guido@python.org> parents: 12436 diff changeset	2384 socklen_t addrlen;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2385
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2386 *addr = NULL;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2387
1295 4773d5c3b5a4 * socketmodule.c: fix long-standing bug in recvfrom() -- addrlen Guido van Rossum <guido@python.org> parents: 1293 diff changeset	2388 if (!getsockaddrlen(s, &addrlen))
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2389 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2390
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2391 if (!IS_SELECTABLE(s)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2392 select_error();
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2393 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2394 }
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2395
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2396 Py_BEGIN_ALLOW_THREADS
35551 57f630a9de26 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35452 diff changeset	2397 memset(&addrbuf, 0, addrlen);
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2398 timeout = internal_select(s, 0);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2399 if (!timeout) {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	2400 #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	2401 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2402 n = recvfrom(s->sock_fd, cbuf, len, flags,
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2403 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	2404 #else
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2405 n = recvfrom(s->sock_fd, cbuf, len, flags,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2406 (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	2407 #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	2408 #else
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2409 n = recvfrom(s->sock_fd, cbuf, len, flags,
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2410 SAS2SA(&addrbuf), &addrlen);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2411 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2412 }
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2413 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	2414
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2415 if (timeout == 1) {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2416 PyErr_SetString(socket_timeout, "timed out");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2417 return -1;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2418 }
3091 7ddfb629ac3f plug some leaks Guido van Rossum <guido@python.org> parents: 2736 diff changeset	2419 if (n < 0) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2420 s->errorhandler();
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2421 return -1;
3091 7ddfb629ac3f plug some leaks Guido van Rossum <guido@python.org> parents: 2736 diff changeset	2422 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2423
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2424 if (!(*addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2425 addrlen, s->sock_proto)))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2426 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2427
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2428 return n;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2429 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2430
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2431 /* s.recvfrom(nbytes [,flags]) method */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2432
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2433 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2434 sock_recvfrom(PySocketSockObject s, PyObject args)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2435 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2436 PyObject *buf = NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2437 PyObject *addr = NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2438 PyObject *ret = NULL;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2439 int recvlen, flags = 0;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2440 ssize_t outlen;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2441
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2442 if (!PyArg_ParseTuple(args, "i\|i:recvfrom", &recvlen, &flags))
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2443 return NULL;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	2444
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2445 if (recvlen < 0) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2446 PyErr_SetString(PyExc_ValueError,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2447 "negative buffersize in recvfrom");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2448 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2449 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2450
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2451 buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2452 if (buf == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2453 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2454
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2455 outlen = sock_recvfrom_guts(s, PyBytes_AS_STRING(buf),
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2456 recvlen, flags, &addr);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2457 if (outlen < 0) {
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	2458 goto finally;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2459 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2460
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2461 if (outlen != recvlen) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2462 /* We did not read as many bytes as we anticipated, resize the
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2463 string if possible and be succesful. */
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2464 if (PyBytes_Resize(buf, outlen) < 0)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2465 /* Oopsy, not so succesful after all. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2466 goto finally;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2467 }
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	2468
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30646 diff changeset	2469 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	2470
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2471 finally:
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2472 Py_XDECREF(buf);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2473 Py_XDECREF(addr);
1207 b564bd4e57e1 * ceval.c: ifdef out the last argument passing compat hack. Guido van Rossum <guido@python.org> parents: 1132 diff changeset	2474 return ret;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2475 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2476
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2477 PyDoc_STRVAR(recvfrom_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2478 "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	2479 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2480 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	2481
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2482
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2483 /* s.recvfrom_into(buffer[, nbytes [,flags]]) method */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2484
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2485 static PyObject *
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2486 sock_recvfrom_into(PySocketSockObject s, PyObject args, PyObject* kwds)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2487 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2488 static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2489
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2490 int recvlen = 0, flags = 0;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2491 ssize_t readlen;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2492 char *buf;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2493 int buflen;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2494
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2495 PyObject *addr = NULL;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2496
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2497 if (!PyArg_ParseTupleAndKeywords(args, kwds, "w#\|ii:recvfrom_into",
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2498 kwlist, &buf, &buflen,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2499 &recvlen, &flags))
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2500 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2501 assert(buf != 0 && buflen > 0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2502
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2503 if (recvlen < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2504 PyErr_SetString(PyExc_ValueError,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2505 "negative buffersize in recvfrom_into");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2506 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2507 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2508 if (recvlen == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2509 /* If nbytes was not specified, use the buffer's length */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2510 recvlen = buflen;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2511 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2512
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2513 readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2514 if (readlen < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2515 /* Return an error */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2516 Py_XDECREF(addr);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2517 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2518 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2519
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2520 /* Return the number of bytes read and the address. Note that we do
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2521 not do anything special here in the case that readlen < recvlen. */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2522 return Py_BuildValue("lN", readlen, addr);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2523 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2524
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2525 PyDoc_STRVAR(recvfrom_into_doc,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2526 "recvfrom_into(buffer[, nbytes[, flags]]) -> (nbytes, address info)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2527 \n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2528 Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2529
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2530
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	2531 /* 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	2532
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2533 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	2534 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	2535 {
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2536 char *buf;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2537 int len, n = -1, flags = 0, timeout;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2538
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11527 diff changeset	2539 if (!PyArg_ParseTuple(args, "s#\|i:send", &buf, &len, &flags))
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	2540 return NULL;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2541
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2542 if (!IS_SELECTABLE(s))
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2543 return select_error();
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2544
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2545 Py_BEGIN_ALLOW_THREADS
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2546 timeout = internal_select(s, 1);
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2547 if (!timeout)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2548 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2549 n = sendsegmented(s->sock_fd, buf, len, flags);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2550 #else
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2551 n = send(s->sock_fd, buf, len, flags);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2552 #endif
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2553 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	2554
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2555 if (timeout == 1) {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2556 PyErr_SetString(socket_timeout, "timed out");
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2557 return NULL;
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2558 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2559 if (n < 0)
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	2560 return s->errorhandler();
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2561 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	2562 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2563
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2564 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	2565 "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	2566 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2567 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	2568 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	2569 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	2570
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2571
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2572 /* 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	2573
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2574 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	2575 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	2576 {
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2577 char *buf;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2578 int len, n = -1, flags = 0, timeout;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2579
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2580 if (!PyArg_ParseTuple(args, "s#\|i:sendall", &buf, &len, &flags))
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2581 return NULL;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2582
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2583 if (!IS_SELECTABLE(s))
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2584 return select_error();
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2585
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2586 Py_BEGIN_ALLOW_THREADS
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2587 do {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2588 timeout = internal_select(s, 1);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2589 n = -1;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2590 if (timeout)
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2591 break;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2592 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2593 n = sendsegmented(s->sock_fd, buf, len, flags);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2594 #else
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2595 n = send(s->sock_fd, buf, len, flags);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2596 #endif
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2597 if (n < 0)
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2598 break;
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2599 buf += n;
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2600 len -= n;
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2601 } while (len > 0);
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2602 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	2603
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2604 if (timeout == 1) {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2605 PyErr_SetString(socket_timeout, "timed out");
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2606 return NULL;
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2607 }
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2608 if (n < 0)
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	2609 return s->errorhandler();
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2610
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2611 Py_INCREF(Py_None);
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2612 return Py_None;
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2613 }
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2614
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2615 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	2616 "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	2617 \n\
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2618 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	2619 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	2620 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	2621 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	2622
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2623
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	2624 /* 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	2625
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2626 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	2627 sock_sendto(PySocketSockObject s, PyObject args)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2628 {
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2629 PyObject *addro;
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2630 char *buf;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2631 sock_addr_t addrbuf;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2632 int addrlen, len, n = -1, flags, timeout;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2633
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	2634 flags = 0;
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	2635 if (!PyArg_ParseTuple(args, "s#O:sendto", &buf, &len, &addro)) {
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2636 PyErr_Clear();
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	2637 if (!PyArg_ParseTuple(args, "s#iO:sendto",
b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	2638 &buf, &len, &flags, &addro))
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	2639 return NULL;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2640 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2641
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2642 if (!IS_SELECTABLE(s))
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2643 return select_error();
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	2644
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2645 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2646 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2647
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2648 Py_BEGIN_ALLOW_THREADS
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2649 timeout = internal_select(s, 1);
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2650 if (!timeout)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2651 n = sendto(s->sock_fd, buf, len, flags, SAS2SA(&addrbuf), addrlen);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2652 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	2653
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2654 if (timeout == 1) {
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2655 PyErr_SetString(socket_timeout, "timed out");
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2656 return NULL;
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2657 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2658 if (n < 0)
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	2659 return s->errorhandler();
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2660 return PyInt_FromLong((long)n);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2661 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2662
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2663 PyDoc_STRVAR(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	2664 "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	2665 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2666 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	2667 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	2668
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2669
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2670 /* s.shutdown(how) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2671
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2672 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	2673 sock_shutdown(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2674 {
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2675 int how;
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2676 int res;
20376 061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	2677
061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	2678 how = PyInt_AsLong(arg);
061da22f4203 Convert socket methods to use METH_O and METH_NOARGS where possible. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20369 diff changeset	2679 if (how == -1 && PyErr_Occurred())
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2680 return NULL;
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2681 Py_BEGIN_ALLOW_THREADS
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2682 res = shutdown(s->sock_fd, how);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2683 Py_END_ALLOW_THREADS
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2684 if (res < 0)
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	2685 return s->errorhandler();
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2686 Py_INCREF(Py_None);
84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2687 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2688 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2689
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2690 PyDoc_STRVAR(shutdown_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2691 "shutdown(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2692 \n\
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	2693 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	2694 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	2695
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2696
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2697 /* List of methods for socket objects */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2698
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2699 static PyMethodDef sock_methods[] = {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2700 {"accept", (PyCFunction)sock_accept, METH_NOARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2701 accept_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2702 {"bind", (PyCFunction)sock_bind, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2703 bind_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2704 {"close", (PyCFunction)sock_close, METH_NOARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2705 close_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2706 {"connect", (PyCFunction)sock_connect, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2707 connect_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2708 {"connect_ex", (PyCFunction)sock_connect_ex, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2709 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	2710 #ifndef NO_DUP
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2711 {"dup", (PyCFunction)sock_dup, METH_NOARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2712 dup_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2713 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2714 {"fileno", (PyCFunction)sock_fileno, METH_NOARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2715 fileno_doc},
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2716 #ifdef HAVE_GETPEERNAME
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2717 {"getpeername", (PyCFunction)sock_getpeername,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2718 METH_NOARGS, getpeername_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2719 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2720 {"getsockname", (PyCFunction)sock_getsockname,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2721 METH_NOARGS, getsockname_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2722 {"getsockopt", (PyCFunction)sock_getsockopt, METH_VARARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2723 getsockopt_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2724 {"listen", (PyCFunction)sock_listen, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2725 listen_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2726 {"recv", (PyCFunction)sock_recv, METH_VARARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2727 recv_doc},
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2728 {"recv_into", (PyCFunction)sock_recv_into, METH_VARARGS \| METH_KEYWORDS,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2729 recv_into_doc},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2730 {"recvfrom", (PyCFunction)sock_recvfrom, METH_VARARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2731 recvfrom_doc},
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2732 {"recvfrom_into", (PyCFunction)sock_recvfrom_into, METH_VARARGS \| METH_KEYWORDS,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2733 recvfrom_into_doc},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2734 {"send", (PyCFunction)sock_send, METH_VARARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2735 send_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2736 {"sendall", (PyCFunction)sock_sendall, METH_VARARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2737 sendall_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2738 {"sendto", (PyCFunction)sock_sendto, METH_VARARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2739 sendto_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2740 {"setblocking", (PyCFunction)sock_setblocking, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2741 setblocking_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2742 {"settimeout", (PyCFunction)sock_settimeout, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2743 settimeout_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2744 {"gettimeout", (PyCFunction)sock_gettimeout, METH_NOARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2745 gettimeout_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2746 {"setsockopt", (PyCFunction)sock_setsockopt, METH_VARARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2747 setsockopt_doc},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2748 {"shutdown", (PyCFunction)sock_shutdown, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2749 shutdown_doc},
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	2750 #ifdef RISCOS
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2751 {"sleeptaskw", (PyCFunction)sock_sleeptaskw, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2752 sleeptaskw_doc},
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	2753 #endif
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2754 {NULL, NULL} /* sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2755 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2756
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2757 /* SockObject members */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2758 static PyMemberDef sock_memberlist[] = {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2759 {"family", T_INT, offsetof(PySocketSockObject, sock_family), READONLY, "the socket family"},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2760 {"type", T_INT, offsetof(PySocketSockObject, sock_type), READONLY, "the socket type"},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2761 {"proto", T_INT, offsetof(PySocketSockObject, sock_proto), READONLY, "the socket protocol"},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2762 {"timeout", T_DOUBLE, offsetof(PySocketSockObject, sock_timeout), READONLY, "the socket timeout"},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2763 {0},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2764 };
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2765
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2766 /* 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	2767 First close the file description. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2768
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2769 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	2770 sock_dealloc(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2771 {
12319 57f34e162e67 In dealloc(), only close the socket if fd != -1. Guido van Rossum <guido@python.org> parents: 12229 diff changeset	2772 if (s->sock_fd != -1)
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	2773 (void) SOCKETCLOSE(s->sock_fd);
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2774 s->ob_type->tp_free((PyObject *)s);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2775 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2776
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2777
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2778 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	2779 sock_repr(PySocketSockObject *s)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2780 {
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2781 #if SIZEOF_SOCKET_T > SIZEOF_LONG
c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2782 if (s->sock_fd > LONG_MAX) {
c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2783 /* this can occur on Win64, and actually there is a special
c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2784 ugly printf formatter for decimal pointer length integer
c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2785 printing, only bother if necessary*/
c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2786 PyErr_SetString(PyExc_OverflowError,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2787 "no printf formatter to display "
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2788 "the socket descriptor in decimal");
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2789 return NULL;
c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2790 }
c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2791 #endif
41941 e4ab08039c75 Simplify socket_repr() by using PyUnicode_FromFormat() Walter Dörwald <walter@livinglogic.de> parents: 41809 diff changeset	2792 return PyUnicode_FromFormat(
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2793 "<socket object, fd=%ld, family=%d, type=%d, proto=%d>",
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2794 (long)s->sock_fd, s->sock_family,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2795 s->sock_type,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2796 s->sock_proto);
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2797 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2798
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2799
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2800 /* 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	2801
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2802 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	2803 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	2804 {
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2805 PyObject *new;
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2806
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2807 new = type->tp_alloc(type, 0);
23711 565032b48f50 The tp_new implementation should initialize the errorhandler field, Guido van Rossum <guido@python.org> parents: 23295 diff changeset	2808 if (new != NULL) {
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2809 ((PySocketSockObject *)new)->sock_fd = -1;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2810 ((PySocketSockObject *)new)->sock_timeout = -1.0;
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2811 ((PySocketSockObject *)new)->errorhandler = &set_error;
23711 565032b48f50 The tp_new implementation should initialize the errorhandler field, Guido van Rossum <guido@python.org> parents: 23295 diff changeset	2812 }
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2813 return new;
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2814 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2815
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2816
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2817 /* 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	2818
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2819 /ARGSUSED/
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2820 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	2821 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	2822 {
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2823 PySocketSockObject s = (PySocketSockObject )self;
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2824 PyObject *fdobj = NULL;
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2825 SOCKET_T 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	2826 int family = AF_INET, type = SOCK_STREAM, proto = 0;
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2827 static char *keywords[] = {"family", "type", "proto", "fileno", 0};
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2828
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2829 if (!PyArg_ParseTupleAndKeywords(args, kwds,
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2830 "\|iiiO:socket", keywords,
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2831 &family, &type, &proto, &fdobj))
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2832 return -1;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2833
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2834 if (fdobj != NULL) {
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2835 fd = PyLong_AsLongLong(fdobj);
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2836 if (fd == (SOCKET_T)(-1) && PyErr_Occurred())
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2837 return -1;
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2838 if (fd == INVALID_SOCKET) {
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2839 PyErr_SetString(PyExc_ValueError,
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2840 "can't use invalid socket value");
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2841 return -1;
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2842 }
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2843 }
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2844 else {
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2845 Py_BEGIN_ALLOW_THREADS
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2846 fd = socket(family, type, proto);
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2847 Py_END_ALLOW_THREADS
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2848
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2849 if (fd == INVALID_SOCKET) {
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2850 set_error();
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2851 return -1;
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	2852 }
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2853 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2854 init_sockobject(s, fd, family, type, proto);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2855
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2856 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2857
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2858 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2859
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2860
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2861 /* 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	2862
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2863 static PyTypeObject sock_type = {
3594 564912267290 Windows/PC changes Guido van Rossum <guido@python.org> parents: 3421 diff changeset	2864 PyObject_HEAD_INIT(0) /* Must fill in type value later */
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2865 0, /* ob_size */
20730 73cabe664c11 Oops. In the tp_name field, the name should be "_socket.socket", not Guido van Rossum <guido@python.org> parents: 20727 diff changeset	2866 "_socket.socket", /* tp_name */
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2867 sizeof(PySocketSockObject), /* tp_basicsize */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2868 0, /* tp_itemsize */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2869 (destructor)sock_dealloc, /* tp_dealloc */
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2870 0, /* tp_print */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2871 0, /* tp_getattr */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2872 0, /* tp_setattr */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2873 0, /* tp_compare */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2874 (reprfunc)sock_repr, /* tp_repr */
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2875 0, /* tp_as_number */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2876 0, /* tp_as_sequence */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2877 0, /* tp_as_mapping */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2878 0, /* tp_hash */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2879 0, /* tp_call */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2880 0, /* tp_str */
27104 2443c557cbc3 Patch #661760: Cygwin auto-import module patch Jason Tishler <jason@tishler.net> parents: 27019 diff changeset	2881 PyObject_GenericGetAttr, /* tp_getattro */
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2882 0, /* tp_setattro */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2883 0, /* tp_as_buffer */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2884 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2885 sock_doc, /* tp_doc */
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2886 0, /* tp_traverse */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2887 0, /* tp_clear */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2888 0, /* tp_richcompare */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2889 0, /* tp_weaklistoffset */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2890 0, /* tp_iter */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2891 0, /* tp_iternext */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2892 sock_methods, /* tp_methods */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	2893 sock_memberlist, /* tp_members */
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2894 0, /* tp_getset */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2895 0, /* tp_base */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2896 0, /* tp_dict */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2897 0, /* tp_descr_get */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2898 0, /* tp_descr_set */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2899 0, /* tp_dictoffset */
23807 cc65b5bcfc38 work around name clash with OS/2 TCPIP routine sock_init() Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 23736 diff changeset	2900 sock_initobj, /* tp_init */
27104 2443c557cbc3 Patch #661760: Cygwin auto-import module patch Jason Tishler <jason@tishler.net> parents: 27019 diff changeset	2901 PyType_GenericAlloc, /* tp_alloc */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2902 sock_new, /* tp_new */
27104 2443c557cbc3 Patch #661760: Cygwin auto-import module patch Jason Tishler <jason@tishler.net> parents: 27019 diff changeset	2903 PyObject_Del, /* tp_free */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2904 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2905
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2906
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2907 /* Python interface to gethostname(). */
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2908
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2909 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2910 static PyObject *
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2911 socket_gethostname(PyObject self, PyObject unused)
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2912 {
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2913 char buf[1024];
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2914 int res;
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2915 Py_BEGIN_ALLOW_THREADS
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2916 res = gethostname(buf, (int) sizeof buf - 1);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2917 Py_END_ALLOW_THREADS
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2918 if (res < 0)
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2919 return set_error();
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2920 buf[sizeof buf - 1] = '\0';
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2921 return PyString_FromString(buf);
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2922 }
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2923
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2924 PyDoc_STRVAR(gethostname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2925 "gethostname() -> string\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2926 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2927 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	2928
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2929
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2930 /* Python interface to gethostbyname(name). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2931
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2932 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2933 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	2934 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	2935 {
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	2936 char *name;
35551 57f630a9de26 - Changes donated by Elemental Security to make it work on AIX 5.3 Guido van Rossum <guido@python.org> parents: 35452 diff changeset	2937 sock_addr_t addrbuf;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2938
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	2939 if (!PyArg_ParseTuple(args, "s:gethostbyname", &name))
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2940 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2941 if (setipaddr(name, SAS2SA(&addrbuf), sizeof(addrbuf), AF_INET) < 0)
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2942 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	2943 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	2944 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2945
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2946 PyDoc_STRVAR(gethostbyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2947 "gethostbyname(host) -> address\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2948 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2949 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	2950
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2951
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2952 /* 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	2953
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2954 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2955 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	2956 {
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2957 char **pch;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2958 PyObject rtn_tuple = (PyObject )NULL;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2959 PyObject name_list = (PyObject )NULL;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2960 PyObject addr_list = (PyObject )NULL;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2961 PyObject *tmp;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2962
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2963 if (h == NULL) {
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	2964 /* 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	2965 #ifndef RISCOS
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2966 set_herror(h_errno);
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	2967 #else
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2968 PyErr_SetString(socket_error, "host not found");
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	2969 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2970 return NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2971 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2972
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2973 if (h->h_addrtype != af) {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2974 #ifdef HAVE_STRERROR
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2975 /* Let's get real error message to return */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2976 PyErr_SetString(socket_error,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2977 (char *)strerror(EAFNOSUPPORT));
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2978 #else
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2979 PyErr_SetString(
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2980 socket_error,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2981 "Address family not supported by protocol family");
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2982 #endif
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2983 return NULL;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	2984 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2985
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2986 switch (af) {
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2987
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2988 case AF_INET:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2989 if (alen < sizeof(struct sockaddr_in))
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2990 return NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2991 break;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2992
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	2993 #ifdef ENABLE_IPV6
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2994 case AF_INET6:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2995 if (alen < sizeof(struct sockaddr_in6))
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2996 return NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2997 break;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	2998 #endif
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2999
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3000 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3001
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3002 if ((name_list = PyList_New(0)) == NULL)
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3003 goto err;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3004
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3005 if ((addr_list = PyList_New(0)) == NULL)
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3006 goto err;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3007
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3008 /* SF #1511317: h_aliases can be NULL */
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3009 if (h->h_aliases) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3010 for (pch = h->h_aliases; *pch != NULL; pch++) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3011 int status;
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3012 tmp = PyString_FromString(*pch);
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3013 if (tmp == NULL)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3014 goto err;
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3015
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3016 status = PyList_Append(name_list, tmp);
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3017 Py_DECREF(tmp);
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3018
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3019 if (status)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3020 goto err;
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	3021 }
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3022 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3023
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3024 for (pch = h->h_addr_list; *pch != NULL; pch++) {
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3025 int status;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3026
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3027 switch (af) {
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3028
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3029 case AF_INET:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3030 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3031 struct sockaddr_in sin;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3032 memset(&sin, 0, sizeof(sin));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3033 sin.sin_family = af;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3034 #ifdef HAVE_SOCKADDR_SA_LEN
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3035 sin.sin_len = sizeof(sin);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3036 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3037 memcpy(&sin.sin_addr, *pch, sizeof(sin.sin_addr));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3038 tmp = makeipaddr((struct sockaddr *)&sin, sizeof(sin));
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3039
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3040 if (pch == h->h_addr_list && alen >= sizeof(sin))
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3041 memcpy((char *) addr, &sin, sizeof(sin));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3042 break;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3043 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3044
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3045 #ifdef ENABLE_IPV6
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3046 case AF_INET6:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3047 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3048 struct sockaddr_in6 sin6;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3049 memset(&sin6, 0, sizeof(sin6));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3050 sin6.sin6_family = af;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3051 #ifdef HAVE_SOCKADDR_SA_LEN
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3052 sin6.sin6_len = sizeof(sin6);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3053 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3054 memcpy(&sin6.sin6_addr, *pch, sizeof(sin6.sin6_addr));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3055 tmp = makeipaddr((struct sockaddr *)&sin6,
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3056 sizeof(sin6));
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3057
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3058 if (pch == h->h_addr_list && alen >= sizeof(sin6))
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3059 memcpy((char *) addr, &sin6, sizeof(sin6));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3060 break;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3061 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3062 #endif
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3063
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3064 default: /* can't happen */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3065 PyErr_SetString(socket_error,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3066 "unsupported address family");
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3067 return NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3068 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3069
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3070 if (tmp == NULL)
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3071 goto err;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3072
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3073 status = PyList_Append(addr_list, tmp);
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3074 Py_DECREF(tmp);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3075
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3076 if (status)
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3077 goto err;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3078 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3079
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3080 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	3081
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3082 err:
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3083 Py_XDECREF(name_list);
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3084 Py_XDECREF(addr_list);
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3085 return rtn_tuple;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3086 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3087
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3088
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3089 /* 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	3090
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3091 /ARGSUSED/
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3092 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	3093 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	3094 {
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3095 char *name;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3096 struct hostent *h;
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28925 diff changeset	3097 #ifdef ENABLE_IPV6
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28925 diff changeset	3098 struct sockaddr_storage addr;
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28925 diff changeset	3099 #else
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28925 diff changeset	3100 struct sockaddr_in addr;
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28925 diff changeset	3101 #endif
18798 d591a96aed06 Instead of accessing ss_family, cast sockaddr_storage to sockaddr and access sa_family. Martin v. Löwis <martin@v.loewis.de> parents: 18794 diff changeset	3102 struct sockaddr *sa;
10441 9ba5dffccb1b Jonathan Giddy writes: Guido van Rossum <guido@python.org> parents: 10401 diff changeset	3103 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	3104 #ifdef HAVE_GETHOSTBYNAME_R
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3105 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	3106 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3107 struct hostent_data data;
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3108 #else
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3109 char buf[16384];
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3110 int buf_len = (sizeof buf) - 1;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3111 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3112 #endif
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3113 #if defined(HAVE_GETHOSTBYNAME_R_3_ARG) \|\| defined(HAVE_GETHOSTBYNAME_R_6_ARG)
10401 f81db738abd9 Patch by Rob Riggs for Linux -- glibc2 has a different argument Guido van Rossum <guido@python.org> parents: 9679 diff changeset	3114 int result;
f81db738abd9 Patch by Rob Riggs for Linux -- glibc2 has a different argument Guido van Rossum <guido@python.org> parents: 9679 diff changeset	3115 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3116 #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	3117
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	3118 if (!PyArg_ParseTuple(args, "s:gethostbyname_ex", &name))
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3119 return NULL;
26597 7ddea4dfa519 Patch #650422: Use Posix AF_ constants instead of PF_ ones. Martin v. Löwis <martin@v.loewis.de> parents: 26551 diff changeset	3120 if (setipaddr(name, (struct sockaddr *)&addr, sizeof(addr), AF_INET) < 0)
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3121 return NULL;
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3122 Py_BEGIN_ALLOW_THREADS
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3123 #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	3124 #if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3125 result = gethostbyname_r(name, &hp_allocated, buf, buf_len,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3126 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3127 #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3128 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	3129 #else /* HAVE_GETHOSTBYNAME_R_3_ARG */
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	3130 memset((void *) &data, '\0', sizeof(data));
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3131 result = gethostbyname_r(name, &hp_allocated, &data);
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3132 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	3133 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3134 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3135 #ifdef USE_GETHOSTBYNAME_LOCK
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3136 PyThread_acquire_lock(netdb_lock, 1);
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3137 #endif
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3138 h = gethostbyname(name);
10441 9ba5dffccb1b Jonathan Giddy writes: Guido van Rossum <guido@python.org> parents: 10401 diff changeset	3139 #endif /* HAVE_GETHOSTBYNAME_R */
9ba5dffccb1b Jonathan Giddy writes: Guido van Rossum <guido@python.org> parents: 10401 diff changeset	3140 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	3141 /* Some C libraries would require addr.__ss_family instead of
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3142 addr.ss_family.
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3143 Therefore, we cast the sockaddr_storage into sockaddr to
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3144 access sa_family. */
18798 d591a96aed06 Instead of accessing ss_family, cast sockaddr_storage to sockaddr and access sa_family. Martin v. Löwis <martin@v.loewis.de> parents: 18794 diff changeset	3145 sa = (struct sockaddr*)&addr;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3146 ret = gethost_common(h, (struct sockaddr *)&addr, sizeof(addr),
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3147 sa->sa_family);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3148 #ifdef USE_GETHOSTBYNAME_LOCK
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3149 PyThread_release_lock(netdb_lock);
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3150 #endif
10441 9ba5dffccb1b Jonathan Giddy writes: Guido van Rossum <guido@python.org> parents: 10401 diff changeset	3151 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	3152 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3153
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3154 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	3155 "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	3156 \n\
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3157 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	3158 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	3159
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3160
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3161 /* Python interface to gethostbyaddr(IP). */
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3162
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3163 /ARGSUSED/
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3164 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	3165 socket_gethostbyaddr(PyObject self, PyObject args)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3166 {
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3167 #ifdef ENABLE_IPV6
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3168 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	3169 #else
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	3170 struct sockaddr_in addr;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3171 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3172 struct sockaddr sa = (struct sockaddr )&addr;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3173 char *ip_num;
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3174 struct hostent *h;
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3175 PyObject *ret;
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3176 #ifdef HAVE_GETHOSTBYNAME_R
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3177 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	3178 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3179 struct hostent_data data;
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3180 #else
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3181 char buf[16384];
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3182 int buf_len = (sizeof buf) - 1;
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3183 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3184 #endif
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3185 #if defined(HAVE_GETHOSTBYNAME_R_3_ARG) \|\| defined(HAVE_GETHOSTBYNAME_R_6_ARG)
10401 f81db738abd9 Patch by Rob Riggs for Linux -- glibc2 has a different argument Guido van Rossum <guido@python.org> parents: 9679 diff changeset	3186 int result;
f81db738abd9 Patch by Rob Riggs for Linux -- glibc2 has a different argument Guido van Rossum <guido@python.org> parents: 9679 diff changeset	3187 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3188 #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	3189 char *ap;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3190 int al;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3191 int af;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3192
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	3193 if (!PyArg_ParseTuple(args, "s:gethostbyaddr", &ip_num))
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3194 return NULL;
26597 7ddea4dfa519 Patch #650422: Use Posix AF_ constants instead of PF_ ones. Martin v. Löwis <martin@v.loewis.de> parents: 26551 diff changeset	3195 af = AF_UNSPEC;
24411 8e266d0acd10 Pass length of result structure into setipaddr. Fixes bug #565747. Martin v. Löwis <martin@v.loewis.de> parents: 24380 diff changeset	3196 if (setipaddr(ip_num, sa, sizeof(addr), af) < 0)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3197 return NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3198 af = sa->sa_family;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3199 ap = NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3200 al = 0;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3201 switch (af) {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3202 case AF_INET:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3203 ap = (char )&((struct sockaddr_in )sa)->sin_addr;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3204 al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3205 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3206 #ifdef ENABLE_IPV6
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3207 case AF_INET6:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3208 ap = (char )&((struct sockaddr_in6 )sa)->sin6_addr;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3209 al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3210 break;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3211 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3212 default:
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3213 PyErr_SetString(socket_error, "unsupported address family");
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3214 return NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3215 }
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3216 Py_BEGIN_ALLOW_THREADS
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3217 #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	3218 #if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3219 result = gethostbyaddr_r(ap, al, af,
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3220 &hp_allocated, buf, buf_len,
10401 f81db738abd9 Patch by Rob Riggs for Linux -- glibc2 has a different argument Guido van Rossum <guido@python.org> parents: 9679 diff changeset	3221 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3222 #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3223 h = gethostbyaddr_r(ap, al, af,
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3224 &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	3225 #else /* HAVE_GETHOSTBYNAME_R_3_ARG */
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	3226 memset((void *) &data, '\0', sizeof(data));
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3227 result = gethostbyaddr_r(ap, al, af, &hp_allocated, &data);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3228 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	3229 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3230 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3231 #ifdef USE_GETHOSTBYNAME_LOCK
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3232 PyThread_acquire_lock(netdb_lock, 1);
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3233 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3234 h = gethostbyaddr(ap, al, af);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3235 #endif /* HAVE_GETHOSTBYNAME_R */
9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3236 Py_END_ALLOW_THREADS
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3237 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	3238 #ifdef USE_GETHOSTBYNAME_LOCK
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3239 PyThread_release_lock(netdb_lock);
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3240 #endif
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3241 return ret;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3242 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3243
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3244 PyDoc_STRVAR(gethostbyaddr_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3245 "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	3246 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3247 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	3248 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	3249
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3250
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3251 /* Python interface to getservbyname(name).
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3252 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	3253 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	3254
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3255 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3256 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	3257 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	3258 {
32429 d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3259 char name, proto=NULL;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3260 struct servent *sp;
32429 d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3261 if (!PyArg_ParseTuple(args, "s\|s:getservbyname", &name, &proto))
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3262 return NULL;
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3263 Py_BEGIN_ALLOW_THREADS
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	3264 sp = getservbyname(name, proto);
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3265 Py_END_ALLOW_THREADS
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3266 if (sp == NULL) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3267 PyErr_SetString(socket_error, "service/proto not found");
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3268 return NULL;
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3269 }
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3270 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	3271 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3272
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3273 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	3274 "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	3275 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3276 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	3277 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	3278 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	3279
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3280
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3281 /* 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	3282 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	3283 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	3284
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3285 /ARGSUSED/
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3286 static PyObject *
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3287 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	3288 {
33606 4d7b0d206bc7 Silence a compiler warning by supplying the correct argument type to Raymond Hettinger <python@rcn.com> parents: 33478 diff changeset	3289 unsigned short port;
32429 d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3290 char *proto=NULL;
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3291 struct servent *sp;
33606 4d7b0d206bc7 Silence a compiler warning by supplying the correct argument type to Raymond Hettinger <python@rcn.com> parents: 33478 diff changeset	3292 if (!PyArg_ParseTuple(args, "H\|s:getservbyport", &port, &proto))
32429 d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3293 return NULL;
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3294 Py_BEGIN_ALLOW_THREADS
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3295 sp = getservbyport(htons(port), proto);
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3296 Py_END_ALLOW_THREADS
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3297 if (sp == NULL) {
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3298 PyErr_SetString(socket_error, "port/proto not found");
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3299 return NULL;
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3300 }
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3301 return PyString_FromString(sp->s_name);
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3302 }
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3303
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3304 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	3305 "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	3306 \n\
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3307 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	3308 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	3309 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	3310
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3311 /* Python interface to getprotobyname(name).
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3312 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	3313 already known or not useful (like the list of aliases). */
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3314
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3315 /ARGSUSED/
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3316 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	3317 socket_getprotobyname(PyObject self, PyObject args)
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3318 {
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3319 char *name;
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3320 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	3321 #ifdef __BEOS__
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	3322 /* Not available in BeOS yet. - [cjh] */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3323 PyErr_SetString(socket_error, "getprotobyname not supported");
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	3324 return NULL;
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	3325 #else
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	3326 if (!PyArg_ParseTuple(args, "s:getprotobyname", &name))
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3327 return NULL;
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3328 Py_BEGIN_ALLOW_THREADS
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3329 sp = getprotobyname(name);
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3330 Py_END_ALLOW_THREADS
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3331 if (sp == NULL) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3332 PyErr_SetString(socket_error, "protocol not found");
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3333 return NULL;
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3334 }
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3335 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	3336 #endif
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3337 }
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3338
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3339 PyDoc_STRVAR(getprotobyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3340 "getprotobyname(name) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3341 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3342 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	3343
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3344
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3345 #ifdef HAVE_SOCKETPAIR
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3346 /* 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	3347 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	3348 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	3349
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3350 /ARGSUSED/
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3351 static PyObject *
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3352 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	3353 {
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3354 PySocketSockObject s0 = NULL, s1 = NULL;
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3355 SOCKET_T sv[2];
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3356 int family, type = SOCK_STREAM, proto = 0;
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3357 PyObject *res = NULL;
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3358
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3359 #if defined(AF_UNIX)
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3360 family = AF_UNIX;
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3361 #else
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3362 family = AF_INET;
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3363 #endif
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3364 if (!PyArg_ParseTuple(args, "\|iii:socketpair",
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3365 &family, &type, &proto))
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3366 return NULL;
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3367 /* Create a pair of socket fds */
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3368 if (socketpair(family, type, proto, sv) < 0)
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3369 return set_error();
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3370 s0 = new_sockobject(sv[0], family, type, proto);
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3371 if (s0 == NULL)
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3372 goto finally;
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3373 s1 = new_sockobject(sv[1], family, type, proto);
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3374 if (s1 == NULL)
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3375 goto finally;
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3376 res = PyTuple_Pack(2, s0, s1);
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3377
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3378 finally:
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3379 if (res == NULL) {
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3380 if (s0 == NULL)
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3381 SOCKETCLOSE(sv[0]);
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3382 if (s1 == NULL)
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3383 SOCKETCLOSE(sv[1]);
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3384 }
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3385 Py_XDECREF(s0);
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3386 Py_XDECREF(s1);
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3387 return res;
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3388 }
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3389
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3390 PyDoc_STRVAR(socketpair_doc,
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3391 "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	3392 \n\
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3393 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	3394 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	3395 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	3396 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	3397
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3398 #endif /* HAVE_SOCKETPAIR */
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3399
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3400
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3401 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	3402 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	3403 {
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3404 int x1, x2;
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3405
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	3406 if (!PyArg_ParseTuple(args, "i:ntohs", &x1)) {
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3407 return NULL;
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3408 }
40638 86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3409 if (x1 < 0) {
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3410 PyErr_SetString(PyExc_OverflowError,
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3411 "can't convert negative number to unsigned long");
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3412 return NULL;
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3413 }
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3414 x2 = (unsigned int)ntohs((unsigned short)x1);
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3415 return PyInt_FromLong(x2);
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3416 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3417
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3418 PyDoc_STRVAR(ntohs_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3419 "ntohs(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3420 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3421 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	3422
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3423
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3424 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3425 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	3426 {
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3427 unsigned long x;
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3428
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40582 diff changeset	3429 if (PyLong_Check(arg)) {
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3430 x = PyLong_AsUnsignedLong(arg);
24380 672843ee4b61 Put checks for error returns in the right place. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24375 diff changeset	3431 if (x == (unsigned long) -1 && PyErr_Occurred())
672843ee4b61 Put checks for error returns in the right place. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24375 diff changeset	3432 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3433 #if SIZEOF_LONG > 4
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3434 {
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3435 unsigned long y;
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3436 /* only want the trailing 32 bits */
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3437 y = x & 0xFFFFFFFFUL;
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3438 if (y ^ x)
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3439 return PyErr_Format(PyExc_OverflowError,
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3440 "long int larger than 32 bits");
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3441 x = y;
24619 b64db550972c internal_connect(): Windows. When sock_timeout > 0 and connect() yields Tim Peters <tim.peters@gmail.com> parents: 24471 diff changeset	3442 }
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3443 #endif
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3444 }
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3445 else
24619 b64db550972c internal_connect(): Windows. When sock_timeout > 0 and connect() yields Tim Peters <tim.peters@gmail.com> parents: 24471 diff changeset	3446 return PyErr_Format(PyExc_TypeError,
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3447 "expected int/long, %s found",
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3448 arg->ob_type->tp_name);
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3449 if (x == (unsigned long) -1 && PyErr_Occurred())
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3450 return NULL;
40638 86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3451 return PyLong_FromUnsignedLong(ntohl(x));
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3452 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3453
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3454 PyDoc_STRVAR(ntohl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3455 "ntohl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3456 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3457 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	3458
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3459
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3460 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	3461 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	3462 {
31207 f388e83f8e43 Fix erroneus argument parsing of socket.htons() on 64bit big endian Hye-Shik Chang <hyeshik@gmail.com> parents: 31027 diff changeset	3463 int x1, x2;
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3464
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	3465 if (!PyArg_ParseTuple(args, "i:htons", &x1)) {
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3466 return NULL;
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3467 }
40638 86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3468 if (x1 < 0) {
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3469 PyErr_SetString(PyExc_OverflowError,
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3470 "can't convert negative number to unsigned long");
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3471 return NULL;
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3472 }
86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3473 x2 = (unsigned int)htons((unsigned short)x1);
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3474 return PyInt_FromLong(x2);
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3475 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3476
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3477 PyDoc_STRVAR(htons_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3478 "htons(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3479 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3480 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	3481
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3482
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3483 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3484 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	3485 {
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3486 unsigned long x;
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3487
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40582 diff changeset	3488 if (PyLong_Check(arg)) {
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3489 x = PyLong_AsUnsignedLong(arg);
24380 672843ee4b61 Put checks for error returns in the right place. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24375 diff changeset	3490 if (x == (unsigned long) -1 && PyErr_Occurred())
672843ee4b61 Put checks for error returns in the right place. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24375 diff changeset	3491 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3492 #if SIZEOF_LONG > 4
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3493 {
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3494 unsigned long y;
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3495 /* only want the trailing 32 bits */
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3496 y = x & 0xFFFFFFFFUL;
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3497 if (y ^ x)
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3498 return PyErr_Format(PyExc_OverflowError,
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3499 "long int larger than 32 bits");
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3500 x = y;
24619 b64db550972c internal_connect(): Windows. When sock_timeout > 0 and connect() yields Tim Peters <tim.peters@gmail.com> parents: 24471 diff changeset	3501 }
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3502 #endif
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3503 }
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3504 else
24619 b64db550972c internal_connect(): Windows. When sock_timeout > 0 and connect() yields Tim Peters <tim.peters@gmail.com> parents: 24471 diff changeset	3505 return PyErr_Format(PyExc_TypeError,
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3506 "expected int/long, %s found",
89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3507 arg->ob_type->tp_name);
40638 86ce1df6a88e Merged revisions 53434 via svnmerge from Guido van Rossum <guido@python.org> parents: 40626 diff changeset	3508 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	3509 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3510
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3511 PyDoc_STRVAR(htonl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3512 "htonl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3513 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3514 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	3515
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3516 /* 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	3517
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3518 PyDoc_STRVAR(inet_aton_doc,
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	3519 "inet_aton(string) -> bytes giving packed 32-bit IP representation\n\
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3520 \n\
11219 2d7331f4dfe3 Port inet_ntoa and inet_aton to Windows: Guido van Rossum <guido@python.org> parents: 11217 diff changeset	3521 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	3522 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	3523
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3524 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	3525 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	3526 {
11268 3fe8d13328c8 It appears that inet_aton() doesn't really exist except in libresolv; Guido van Rossum <guido@python.org> parents: 11219 diff changeset	3527 #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	3528 #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	3529 #endif
27858 9453d8cdd01e Ummm, try to get it right this time Neal Norwitz <nnorwitz@gmail.com> parents: 27857 diff changeset	3530 #ifdef HAVE_INET_ATON
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3531 struct in_addr buf;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3532 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3533
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3534 #if !defined(HAVE_INET_ATON) \|\| defined(USE_INET_ATON_WEAKLINK)
27861 f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3535 /* Have to use inet_addr() instead */
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3536 unsigned long packed_addr;
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3537 #endif
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3538 char *ip_addr;
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3539
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3540 if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr))
11219 2d7331f4dfe3 Port inet_ntoa and inet_aton to Windows: Guido van Rossum <guido@python.org> parents: 11217 diff changeset	3541 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	3542
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3543
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3544 #ifdef HAVE_INET_ATON
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3545
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3546 #ifdef USE_INET_ATON_WEAKLINK
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3547 if (inet_aton != NULL) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3548 #endif
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3549 if (inet_aton(ip_addr, &buf))
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	3550 return PyBytes_FromStringAndSize((char *)(&buf),
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3551 sizeof(buf));
81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3552
81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3553 PyErr_SetString(socket_error,
81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3554 "illegal IP address string passed to inet_aton");
81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3555 return NULL;
81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3556
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3557 #ifdef USE_INET_ATON_WEAKLINK
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3558 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3559 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3560
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3561 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3562
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3563 #if !defined(HAVE_INET_ATON) \|\| defined(USE_INET_ATON_WEAKLINK)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3564
35452 59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3565 /* special-case this address as inet_addr might return INADDR_NONE
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3566 * for this */
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3567 if (strcmp(ip_addr, "255.255.255.255") == 0) {
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3568 packed_addr = 0xFFFFFFFF;
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3569 } else {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3570
35452 59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3571 packed_addr = inet_addr(ip_addr);
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3572
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3573 if (packed_addr == INADDR_NONE) { /* invalid address */
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3574 PyErr_SetString(socket_error,
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3575 "illegal IP address string passed to inet_aton");
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3576 return NULL;
59a63b09a4c2 backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Georg Brandl <georg@python.org> parents: 33928 diff changeset	3577 }
11219 2d7331f4dfe3 Port inet_ntoa and inet_aton to Windows: Guido van Rossum <guido@python.org> parents: 11217 diff changeset	3578 }
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	3579 return PyBytes_FromStringAndSize((char *) &packed_addr,
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	3580 sizeof(packed_addr));
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3581
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3582 #ifdef USE_INET_ATON_WEAKLINK
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3583 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3584 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3585
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3586 #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	3587 }
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3588
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3589 PyDoc_STRVAR(inet_ntoa_doc,
11937 ef98ee6aeb42 Fixed inet_ntoa() docstring. Fred Drake <fdrake@acm.org> parents: 11882 diff changeset	3590 "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	3591 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3592 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	3593
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3594 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	3595 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	3596 {
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3597 char *packed_str;
11219 2d7331f4dfe3 Port inet_ntoa and inet_aton to Windows: Guido van Rossum <guido@python.org> parents: 11217 diff changeset	3598 int addr_len;
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3599 struct in_addr packed_addr;
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3600
12050 b90880c0e5eb Fix all routines to use PyArg_ParseTuple(), and add ":name" to the Guido van Rossum <guido@python.org> parents: 11937 diff changeset	3601 if (!PyArg_ParseTuple(args, "s#:inet_ntoa", &packed_str, &addr_len)) {
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3602 return NULL;
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3603 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	3604
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3605 if (addr_len != sizeof(packed_addr)) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3606 PyErr_SetString(socket_error,
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3607 "packed IP wrong length for inet_ntoa");
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3608 return NULL;
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3609 }
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3610
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3611 memcpy(&packed_addr, packed_str, addr_len);
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3612
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3613 return PyString_FromString(inet_ntoa(packed_addr));
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3614 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3615
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3616 #ifdef HAVE_INET_PTON
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3617
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3618 PyDoc_STRVAR(inet_pton_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3619 "inet_pton(af, ip) -> packed IP address string\n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3620 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3621 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	3622 for use with low-level network functions.");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3623
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3624 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3625 socket_inet_pton(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3626 {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3627 int af;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3628 char* ip;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3629 int retval;
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3630 #ifdef ENABLE_IPV6
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3631 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	3632 #else
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3633 char packed[sizeof(struct in_addr)];
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3634 #endif
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3635 if (!PyArg_ParseTuple(args, "is:inet_pton", &af, &ip)) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3636 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3637 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3638
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	3639 #if !defined(ENABLE_IPV6) && defined(AF_INET6)
30061 354c7ee438bf Patch #781722: Reject AF_INET6 if IPv6 is disabled. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 29929 diff changeset	3640 if(af == AF_INET6) {
354c7ee438bf Patch #781722: Reject AF_INET6 if IPv6 is disabled. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 29929 diff changeset	3641 PyErr_SetString(socket_error,
354c7ee438bf Patch #781722: Reject AF_INET6 if IPv6 is disabled. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 29929 diff changeset	3642 "can't use AF_INET6, IPv6 is disabled");
354c7ee438bf Patch #781722: Reject AF_INET6 if IPv6 is disabled. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 29929 diff changeset	3643 return NULL;
354c7ee438bf Patch #781722: Reject AF_INET6 if IPv6 is disabled. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 29929 diff changeset	3644 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3645 #endif
30061 354c7ee438bf Patch #781722: Reject AF_INET6 if IPv6 is disabled. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 29929 diff changeset	3646
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3647 retval = inet_pton(af, ip, packed);
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3648 if (retval < 0) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3649 PyErr_SetFromErrno(socket_error);
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3650 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3651 } else if (retval == 0) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3652 PyErr_SetString(socket_error,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3653 "illegal IP address string passed to inet_pton");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3654 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3655 } else if (af == AF_INET) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3656 return PyString_FromStringAndSize(packed,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3657 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	3658 #ifdef ENABLE_IPV6
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3659 } else if (af == AF_INET6) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3660 return PyString_FromStringAndSize(packed,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3661 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	3662 #endif
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3663 } else {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3664 PyErr_SetString(socket_error, "unknown address family");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3665 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3666 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3667 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3668
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3669 PyDoc_STRVAR(inet_ntop_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3670 "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	3671 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3672 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	3673
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3674 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3675 socket_inet_ntop(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3676 {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3677 int af;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3678 char* packed;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3679 int len;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3680 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	3681 #ifdef ENABLE_IPV6
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3682 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	3683 #else
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3684 char ip[INET_ADDRSTRLEN + 1];
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3685 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3686
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3687 /* Guarantee NUL-termination for PyString_FromString() below */
33928 0d4ecc31cfd8 Fix apparently trivial buffer overflow (SF bug 1060396). Jeremy Hylton <jeremy@alum.mit.edu> parents: 33760 diff changeset	3688 memset((void *) &ip[0], '\0', sizeof(ip));
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3689
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3690 if (!PyArg_ParseTuple(args, "is#:inet_ntop", &af, &packed, &len)) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3691 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3692 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3693
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3694 if (af == AF_INET) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3695 if (len != sizeof(struct in_addr)) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3696 PyErr_SetString(PyExc_ValueError,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3697 "invalid length of packed IP address string");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3698 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3699 }
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3700 #ifdef ENABLE_IPV6
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3701 } else if (af == AF_INET6) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3702 if (len != sizeof(struct in6_addr)) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3703 PyErr_SetString(PyExc_ValueError,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3704 "invalid length of packed IP address string");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3705 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3706 }
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3707 #endif
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3708 } else {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3709 PyErr_Format(PyExc_ValueError,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3710 "unknown address family %d", af);
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3711 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3712 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3713
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3714 retval = inet_ntop(af, packed, ip, sizeof(ip));
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3715 if (!retval) {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3716 PyErr_SetFromErrno(socket_error);
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3717 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3718 } else {
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3719 return PyString_FromString(retval);
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3720 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3721
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3722 /* NOTREACHED */
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3723 PyErr_SetString(PyExc_RuntimeError, "invalid handling of inet_ntop");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3724 return NULL;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3725 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3726
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3727 #endif /* HAVE_INET_PTON */
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3728
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3729 /* 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	3730
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3731 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3732 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	3733 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	3734 {
20912 06d95b6877c4 Fix memory leaks detecting in bug report #478003. Martin v. Löwis <martin@v.loewis.de> parents: 20871 diff changeset	3735 struct addrinfo hints, *res;
06d95b6877c4 Fix memory leaks detecting in bug report #478003. Martin v. Löwis <martin@v.loewis.de> parents: 20871 diff changeset	3736 struct addrinfo *res0 = NULL;
28671 d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3737 PyObject *hobj = NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3738 PyObject pobj = (PyObject )NULL;
19197 01a9b7807160 Bump size of sprintf buffer. Suggested by Alex Coventry. Martin v. Löwis <martin@v.loewis.de> parents: 19151 diff changeset	3739 char pbuf[30];
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3740 char hptr, pptr;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3741 int family, socktype, protocol, flags;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3742 int error;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3743 PyObject all = (PyObject )NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3744 PyObject single = (PyObject )NULL;
28671 d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3745 PyObject *idna = NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3746
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3747 family = socktype = protocol = flags = 0;
26597 7ddea4dfa519 Patch #650422: Use Posix AF_ constants instead of PF_ ones. Martin v. Löwis <martin@v.loewis.de> parents: 26551 diff changeset	3748 family = AF_UNSPEC;
28671 d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3749 if (!PyArg_ParseTuple(args, "OO\|iiii:getaddrinfo",
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3750 &hobj, &pobj, &family, &socktype,
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3751 &protocol, &flags)) {
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3752 return NULL;
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3753 }
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3754 if (hobj == Py_None) {
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3755 hptr = NULL;
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3756 } else if (PyUnicode_Check(hobj)) {
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3757 idna = PyObject_CallMethod(hobj, "encode", "s", "idna");
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3758 if (!idna)
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3759 return NULL;
41770 651fa2c9c2ab Make test_socket pass. There was an unchecked error when a Unicode Guido van Rossum <guido@python.org> parents: 41769 diff changeset	3760 assert(PyBytes_Check(idna));
651fa2c9c2ab Make test_socket pass. There was an unchecked error when a Unicode Guido van Rossum <guido@python.org> parents: 41769 diff changeset	3761 hptr = PyBytes_AsString(idna);
28671 d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3762 } else if (PyString_Check(hobj)) {
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3763 hptr = PyString_AsString(hobj);
d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3764 } else {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3765 PyErr_SetString(PyExc_TypeError,
28671 d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3766 "getaddrinfo() argument 1 must be string or None");
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3767 return NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3768 }
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40582 diff changeset	3769 if (PyInt_CheckExact(pobj)) {
18915 510f7f6a877e Enable PyOS_snprintf() et al. during alpha phase of 2.2.0 and Marc-André Lemburg <mal@egenix.com> parents: 18879 diff changeset	3770 PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", PyInt_AsLong(pobj));
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3771 pptr = pbuf;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3772 } else if (PyString_Check(pobj)) {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3773 pptr = PyString_AsString(pobj);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3774 } else if (pobj == Py_None) {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3775 pptr = (char *)NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3776 } else {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3777 PyErr_SetString(socket_error, "Int or String expected");
30081 7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	3778 goto err;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3779 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3780 memset(&hints, 0, sizeof(hints));
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3781 hints.ai_family = family;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3782 hints.ai_socktype = socktype;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3783 hints.ai_protocol = protocol;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3784 hints.ai_flags = flags;
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3785 Py_BEGIN_ALLOW_THREADS
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3786 ACQUIRE_GETADDRINFO_LOCK
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3787 error = getaddrinfo(hptr, pptr, &hints, &res0);
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3788 Py_END_ALLOW_THREADS
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3789 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3790 if (error) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3791 set_gaierror(error);
30081 7f5489184d94 Release host name memory. Fixes #783312. Will backport to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30061 diff changeset	3792 goto err;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3793 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3794
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3795 if ((all = PyList_New(0)) == NULL)
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3796 goto err;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3797 for (res = res0; res; res = res->ai_next) {
20389 b47168178d87 PySocket_getaddrinfo(): fix two refcount bugs, both having to do with Guido van Rossum <guido@python.org> parents: 20378 diff changeset	3798 PyObject *addr =
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	3799 makesockaddr(-1, res->ai_addr, res->ai_addrlen, protocol);
20389 b47168178d87 PySocket_getaddrinfo(): fix two refcount bugs, both having to do with Guido van Rossum <guido@python.org> parents: 20378 diff changeset	3800 if (addr == NULL)
b47168178d87 PySocket_getaddrinfo(): fix two refcount bugs, both having to do with Guido van Rossum <guido@python.org> parents: 20378 diff changeset	3801 goto err;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3802 single = Py_BuildValue("iiisO", res->ai_family,
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3803 res->ai_socktype, res->ai_protocol,
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3804 res->ai_canonname ? res->ai_canonname : "",
20389 b47168178d87 PySocket_getaddrinfo(): fix two refcount bugs, both having to do with Guido van Rossum <guido@python.org> parents: 20378 diff changeset	3805 addr);
b47168178d87 PySocket_getaddrinfo(): fix two refcount bugs, both having to do with Guido van Rossum <guido@python.org> parents: 20378 diff changeset	3806 Py_DECREF(addr);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3807 if (single == NULL)
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3808 goto err;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3809
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3810 if (PyList_Append(all, single))
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3811 goto err;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3812 Py_XDECREF(single);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3813 }
28671 d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3814 Py_XDECREF(idna);
24687 8b470281645e SF bug #592645 fix memory leak in socket.getaddrinfo Neal Norwitz <nnorwitz@gmail.com> parents: 24677 diff changeset	3815 if (res0)
8b470281645e SF bug #592645 fix memory leak in socket.getaddrinfo Neal Norwitz <nnorwitz@gmail.com> parents: 24677 diff changeset	3816 freeaddrinfo(res0);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3817 return all;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3818 err:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3819 Py_XDECREF(single);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3820 Py_XDECREF(all);
28671 d41d8de9768f Implement IDNA (Internationalized Domain Names in Applications). Martin v. Löwis <martin@v.loewis.de> parents: 28437 diff changeset	3821 Py_XDECREF(idna);
20912 06d95b6877c4 Fix memory leaks detecting in bug report #478003. Martin v. Löwis <martin@v.loewis.de> parents: 20871 diff changeset	3822 if (res0)
06d95b6877c4 Fix memory leaks detecting in bug report #478003. Martin v. Löwis <martin@v.loewis.de> parents: 20871 diff changeset	3823 freeaddrinfo(res0);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3824 return (PyObject *)NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3825 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3826
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3827 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	3828 "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	3829 -> 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	3830 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3831 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	3832
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3833 /* 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	3834
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3835 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3836 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	3837 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	3838 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3839 PyObject sa = (PyObject )NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3840 int flags;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3841 char *hostp;
20853 77bb2ae067c2 Correct getnameinfo refcounting and tuple parsing. Fixes #476648. Martin v. Löwis <martin@v.loewis.de> parents: 20756 diff changeset	3842 int port, flowinfo, scope_id;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3843 char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3844 struct addrinfo hints, *res = NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3845 int error;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3846 PyObject ret = (PyObject )NULL;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3847
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3848 flags = flowinfo = scope_id = 0;
20853 77bb2ae067c2 Correct getnameinfo refcounting and tuple parsing. Fixes #476648. Martin v. Löwis <martin@v.loewis.de> parents: 20756 diff changeset	3849 if (!PyArg_ParseTuple(args, "Oi:getnameinfo", &sa, &flags))
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3850 return NULL;
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3851 if (!PyArg_ParseTuple(sa, "si\|ii",
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3852 &hostp, &port, &flowinfo, &scope_id))
20853 77bb2ae067c2 Correct getnameinfo refcounting and tuple parsing. Fixes #476648. Martin v. Löwis <martin@v.loewis.de> parents: 20756 diff changeset	3853 return NULL;
18915 510f7f6a877e Enable PyOS_snprintf() et al. during alpha phase of 2.2.0 and Marc-André Lemburg <mal@egenix.com> parents: 18879 diff changeset	3854 PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3855 memset(&hints, 0, sizeof(hints));
26597 7ddea4dfa519 Patch #650422: Use Posix AF_ constants instead of PF_ ones. Martin v. Löwis <martin@v.loewis.de> parents: 26551 diff changeset	3856 hints.ai_family = AF_UNSPEC;
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	3857 hints.ai_socktype = SOCK_DGRAM; /* make numeric port happy */
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3858 Py_BEGIN_ALLOW_THREADS
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3859 ACQUIRE_GETADDRINFO_LOCK
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3860 error = getaddrinfo(hostp, pbuf, &hints, &res);
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3861 Py_END_ALLOW_THREADS
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	3862 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3863 if (error) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3864 set_gaierror(error);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3865 goto fail;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3866 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3867 if (res->ai_next) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3868 PyErr_SetString(socket_error,
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3869 "sockaddr resolved to multiple addresses");
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3870 goto fail;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3871 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3872 switch (res->ai_family) {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3873 case AF_INET:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3874 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3875 char *t1;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3876 int t2;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3877 if (PyArg_ParseTuple(sa, "si", &t1, &t2) == 0) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3878 PyErr_SetString(socket_error,
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3879 "IPv4 sockaddr must be 2 tuple");
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3880 goto fail;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3881 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3882 break;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3883 }
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3884 #ifdef ENABLE_IPV6
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3885 case AF_INET6:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3886 {
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3887 struct sockaddr_in6 *sin6;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3888 sin6 = (struct sockaddr_in6 *)res->ai_addr;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3889 sin6->sin6_flowinfo = flowinfo;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3890 sin6->sin6_scope_id = scope_id;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3891 break;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3892 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3893 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3894 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3895 error = getnameinfo(res->ai_addr, res->ai_addrlen,
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3896 hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), flags);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3897 if (error) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3898 set_gaierror(error);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3899 goto fail;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3900 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3901 ret = Py_BuildValue("ss", hbuf, pbuf);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3902
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3903 fail:
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3904 if (res)
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3905 freeaddrinfo(res);
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3906 return ret;
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3907 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3908
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3909 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	3910 "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	3911 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3912 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	3913
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3914
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3915 /* 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	3916
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3917 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3918 socket_getdefaulttimeout(PyObject *self)
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3919 {
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3920 if (defaulttimeout < 0.0) {
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3921 Py_INCREF(Py_None);
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3922 return Py_None;
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3923 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3924 else
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3925 return PyFloat_FromDouble(defaulttimeout);
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3926 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3927
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3928 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	3929 "getdefaulttimeout() -> timeout\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3930 \n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3931 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	3932 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	3933 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	3934
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3935 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3936 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	3937 {
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3938 double timeout;
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3939
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3940 if (arg == Py_None)
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3941 timeout = -1.0;
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3942 else {
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3943 timeout = PyFloat_AsDouble(arg);
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3944 if (timeout < 0.0) {
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3945 if (!PyErr_Occurred())
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3946 PyErr_SetString(PyExc_ValueError,
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3947 "Timeout value out of range");
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3948 return NULL;
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3949 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3950 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3951
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3952 defaulttimeout = timeout;
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3953
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3954 Py_INCREF(Py_None);
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3955 return Py_None;
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3956 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3957
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3958 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	3959 "setdefaulttimeout(timeout)\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3960 \n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3961 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	3962 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	3963 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	3964
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	3965
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3966 /* 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	3967
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3968 static PyMethodDef socket_methods[] = {
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3969 {"gethostbyname", socket_gethostbyname,
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	3970 METH_VARARGS, gethostbyname_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3971 {"gethostbyname_ex", socket_gethostbyname_ex,
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	3972 METH_VARARGS, ghbn_ex_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3973 {"gethostbyaddr", socket_gethostbyaddr,
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	3974 METH_VARARGS, gethostbyaddr_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3975 {"gethostname", socket_gethostname,
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3976 METH_NOARGS, gethostname_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3977 {"getservbyname", socket_getservbyname,
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	3978 METH_VARARGS, getservbyname_doc},
32429 d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3979 {"getservbyport", socket_getservbyport,
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3980 METH_VARARGS, getservbyport_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3981 {"getprotobyname", socket_getprotobyname,
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3982 METH_VARARGS, getprotobyname_doc},
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3983 #ifdef HAVE_SOCKETPAIR
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3984 {"socketpair", socket_socketpair,
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3985 METH_VARARGS, socketpair_doc},
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3986 #endif
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3987 {"ntohs", socket_ntohs,
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	3988 METH_VARARGS, ntohs_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3989 {"ntohl", socket_ntohl,
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3990 METH_O, ntohl_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3991 {"htons", socket_htons,
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	3992 METH_VARARGS, htons_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3993 {"htonl", socket_htonl,
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3994 METH_O, htonl_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3995 {"inet_aton", socket_inet_aton,
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	3996 METH_VARARGS, inet_aton_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3997 {"inet_ntoa", socket_inet_ntoa,
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	3998 METH_VARARGS, inet_ntoa_doc},
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3999 #ifdef HAVE_INET_PTON
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4000 {"inet_pton", socket_inet_pton,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4001 METH_VARARGS, inet_pton_doc},
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4002 {"inet_ntop", socket_inet_ntop,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4003 METH_VARARGS, inet_ntop_doc},
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4004 #endif
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4005 {"getaddrinfo", socket_getaddrinfo,
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4006 METH_VARARGS, getaddrinfo_doc},
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4007 {"getnameinfo", socket_getnameinfo,
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4008 METH_VARARGS, getnameinfo_doc},
24303 93434bc0899d Silence warning about getdefaulttimeout in PyMethodDef. Guido van Rossum <guido@python.org> parents: 24293 diff changeset	4009 {"getdefaulttimeout", (PyCFunction)socket_getdefaulttimeout,
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4010 METH_NOARGS, getdefaulttimeout_doc},
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4011 {"setdefaulttimeout", socket_setdefaulttimeout,
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4012 METH_O, setdefaulttimeout_doc},
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4013 {NULL, NULL} /* Sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4014 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4015
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4016
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4017 #ifdef RISCOS
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4018 #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	4019
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4020 static int
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4021 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	4022 {
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4023 _kernel_swi_regs r;
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4024
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4025 r.r[0] = 0;
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4026 _kernel_swi(0x43380, &r, &r);
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4027 taskwindow = r.r[0];
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4028
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4029 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	4030 }
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4031
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4032 #endif /* RISCOS */
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4033
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4034
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	4035 #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	4036 #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	4037
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4038 /* 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	4039
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	4040 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	4041 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	4042 {
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	4043 WSACleanup();
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	4044 }
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	4045
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	4046 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	4047 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	4048 {
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	4049 WSADATA WSAData;
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	4050 int ret;
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	4051 ret = WSAStartup(0x0101, &WSAData);
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	4052 switch (ret) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4053 case 0: /* No error */
29790 1037feacb54f Fix [ 766669 ] Consistent GPF on exit Mark Hammond <mhammond@skippinet.com.au> parents: 29651 diff changeset	4054 Py_AtExit(os_cleanup);
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4055 return 1; /* Success */
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	4056 case WSASYSNOTREADY:
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	4057 PyErr_SetString(PyExc_ImportError,
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	4058 "WSAStartup failed: network not ready");
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	4059 break;
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	4060 case WSAVERNOTSUPPORTED:
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	4061 case WSAEINVAL:
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4062 PyErr_SetString(
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4063 PyExc_ImportError,
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4064 "WSAStartup failed: requested version not supported");
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	4065 break;
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	4066 default:
41943 8bcfc46e444b Simplify os_init() implementations by using PyErr_Format() Walter Dörwald <walter@livinglogic.de> parents: 41942 diff changeset	4067 PyErr_Format(PyExc_ImportError, "WSAStartup failed: error code %d", ret);
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	4068 break;
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	4069 }
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4070 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	4071 }
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	4072
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	4073 #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	4074
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4075
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4076 #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	4077 #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	4078
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4079 /* Additional initialization for OS/2 */
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4080
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4081 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	4082 os_init(void)
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4083 {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4084 #ifndef PYCC_GCC
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4085 int rc = sock_init();
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4086
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4087 if (rc == 0) {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4088 return 1; /* Success */
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4089 }
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4090
41943 8bcfc46e444b Simplify os_init() implementations by using PyErr_Format() Walter Dörwald <walter@livinglogic.de> parents: 41942 diff changeset	4091 PyErr_Format(PyExc_ImportError, "OS/2 TCP/IP Error# %d", sock_errno());
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4092
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4093 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	4094 #else
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4095 /* No need to initialise sockets with GCC/EMX */
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4096 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	4097 #endif
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4098 }
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4099
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4100 #endif /* PYOS_OS2 */
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4101
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4102
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4103 #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	4104 static int
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4105 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	4106 {
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4107 return 1; /* Success */
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4108 }
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4109 #endif
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4110
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4111
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	4112 /* 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	4113 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	4114 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	4115 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	4116 {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4117 &sock_type,
31790 29da8bdfeb4e Make socket.sslerror a subclass of socket.error . Brett Cannon <bcannon@gmail.com> parents: 31541 diff changeset	4118 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	4119 };
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	4120
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4121
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4122 /* 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	4123
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4124 This module is actually called "_socket", and there's a wrapper
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	4125 "socket.py" which implements some additional functionality.
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	4126 The import of "_socket" may fail with an ImportError exception if
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	4127 os-specific initialization fails. On Windows, this does WINSOCK
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	4128 initialization. When WINSOCK is initialized succesfully, a call to
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	4129 WSACleanup() is scheduled to be made at exit time.
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4130 */
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4131
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4132 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	4133 "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	4134 \n\
980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	4135 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	4136
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24411 diff changeset	4137 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	4138 init_socket(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4139 {
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4140 PyObject m, has_ipv6;
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4141
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4142 if (!os_init())
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	4143 return;
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4144
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4145 sock_type.ob_type = &PyType_Type;
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4146 m = Py_InitModule3(PySocket_MODULE_NAME,
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4147 socket_methods,
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4148 socket_doc);
36324 1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 36298 diff changeset	4149 if (m == NULL)
1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 36298 diff changeset	4150 return;
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4151
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4152 socket_error = PyErr_NewException("socket.error", NULL, NULL);
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4153 if (socket_error == NULL)
6367 2c29b8982643 Apply two changes, systematically: Guido van Rossum <guido@python.org> parents: 5697 diff changeset	4154 return;
31790 29da8bdfeb4e Make socket.sslerror a subclass of socket.error . Brett Cannon <bcannon@gmail.com> parents: 31541 diff changeset	4155 PySocketModuleAPI.error = socket_error;
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4156 Py_INCREF(socket_error);
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4157 PyModule_AddObject(m, "error", socket_error);
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4158 socket_herror = PyErr_NewException("socket.herror",
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4159 socket_error, NULL);
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4160 if (socket_herror == NULL)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4161 return;
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4162 Py_INCREF(socket_herror);
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4163 PyModule_AddObject(m, "herror", socket_herror);
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4164 socket_gaierror = PyErr_NewException("socket.gaierror", socket_error,
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4165 NULL);
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4166 if (socket_gaierror == NULL)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4167 return;
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4168 Py_INCREF(socket_gaierror);
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4169 PyModule_AddObject(m, "gaierror", socket_gaierror);
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	4170 socket_timeout = PyErr_NewException("socket.timeout",
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	4171 socket_error, NULL);
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	4172 if (socket_timeout == NULL)
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	4173 return;
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	4174 Py_INCREF(socket_timeout);
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	4175 PyModule_AddObject(m, "timeout", socket_timeout);
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4176 Py_INCREF((PyObject *)&sock_type);
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4177 if (PyModule_AddObject(m, "SocketType",
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4178 (PyObject *)&sock_type) != 0)
6367 2c29b8982643 Apply two changes, systematically: Guido van Rossum <guido@python.org> parents: 5697 diff changeset	4179 return;
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4180 Py_INCREF((PyObject *)&sock_type);
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4181 if (PyModule_AddObject(m, "socket",
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4182 (PyObject *)&sock_type) != 0)
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	4183 return;
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4184
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4185 #ifdef ENABLE_IPV6
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4186 has_ipv6 = Py_True;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4187 #else
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4188 has_ipv6 = Py_False;
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4189 #endif
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4190 Py_INCREF(has_ipv6);
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4191 PyModule_AddObject(m, "has_ipv6", has_ipv6);
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4192
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	4193 /* Export C API */
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4194 if (PyModule_AddObject(m, PySocket_CAPI_NAME,
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	4195 PyCObject_FromVoidPtr((void *)&PySocketModuleAPI, NULL)
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	4196 ) != 0)
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	4197 return;
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	4198
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4199 /* Address families (we only support AF_INET and AF_UNIX) */
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4200 #ifdef AF_UNSPEC
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4201 PyModule_AddIntConstant(m, "AF_UNSPEC", AF_UNSPEC);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4202 #endif
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4203 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	4204 #ifdef AF_INET6
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4205 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	4206 #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	4207 #if defined(AF_UNIX)
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4208 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	4209 #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	4210 #ifdef AF_AX25
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4211 /* Amateur Radio AX.25 */
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4212 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	4213 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4214 #ifdef AF_IPX
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4215 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	4216 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4217 #ifdef AF_APPLETALK
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4218 /* Appletalk DDP */
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4219 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	4220 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4221 #ifdef AF_NETROM
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4222 /* Amateur radio NetROM */
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4223 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	4224 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4225 #ifdef AF_BRIDGE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4226 /* Multiprotocol bridge */
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4227 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	4228 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4229 #ifdef AF_ATMPVC
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4230 /* ATM PVCs */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4231 PyModule_AddIntConstant(m, "AF_ATMPVC", AF_ATMPVC);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4232 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4233 #ifdef AF_AAL5
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4234 /* Reserved for Werner's ATM */
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4235 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	4236 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4237 #ifdef AF_X25
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4238 /* Reserved for X.25 project */
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4239 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	4240 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4241 #ifdef AF_INET6
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4242 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	4243 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4244 #ifdef AF_ROSE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4245 /* Amateur Radio X.25 PLP */
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4246 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	4247 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4248 #ifdef AF_DECnet
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4249 /* Reserved for DECnet project */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4250 PyModule_AddIntConstant(m, "AF_DECnet", AF_DECnet);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4251 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4252 #ifdef AF_NETBEUI
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4253 /* Reserved for 802.2LLC project */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4254 PyModule_AddIntConstant(m, "AF_NETBEUI", AF_NETBEUI);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4255 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4256 #ifdef AF_SECURITY
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4257 /* Security callback pseudo AF */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4258 PyModule_AddIntConstant(m, "AF_SECURITY", AF_SECURITY);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4259 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4260 #ifdef AF_KEY
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4261 /* PF_KEY key management API */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4262 PyModule_AddIntConstant(m, "AF_KEY", AF_KEY);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4263 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4264 #ifdef AF_NETLINK
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4265 /* */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4266 PyModule_AddIntConstant(m, "AF_NETLINK", AF_NETLINK);
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4267 PyModule_AddIntConstant(m, "NETLINK_ROUTE", NETLINK_ROUTE);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4268 #ifdef NETLINK_SKIP
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4269 PyModule_AddIntConstant(m, "NETLINK_SKIP", NETLINK_SKIP);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4270 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4271 #ifdef NETLINK_W1
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4272 PyModule_AddIntConstant(m, "NETLINK_W1", NETLINK_W1);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4273 #endif
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4274 PyModule_AddIntConstant(m, "NETLINK_USERSOCK", NETLINK_USERSOCK);
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4275 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	4276 #ifdef NETLINK_TCPDIAG
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4277 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	4278 #endif
4d988dda6478 NETLINK_TCPDIAG and NETLINK_NFLOG aren't defined on older Linux Guido van Rossum <guido@python.org> parents: 36610 diff changeset	4279 #ifdef NETLINK_NFLOG
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4280 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	4281 #endif
36298 9eeaa33f9640 Get socketmodule to build after adding netlink support. Neal Norwitz <nnorwitz@gmail.com> parents: 36289 diff changeset	4282 #ifdef NETLINK_XFRM
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4283 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	4284 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4285 #ifdef NETLINK_ARPD
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4286 PyModule_AddIntConstant(m, "NETLINK_ARPD", NETLINK_ARPD);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4287 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4288 #ifdef NETLINK_ROUTE6
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4289 PyModule_AddIntConstant(m, "NETLINK_ROUTE6", NETLINK_ROUTE6);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4290 #endif
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4291 PyModule_AddIntConstant(m, "NETLINK_IP6_FW", NETLINK_IP6_FW);
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	4292 #ifdef NETLINK_DNRTMSG
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4293 PyModule_AddIntConstant(m, "NETLINK_DNRTMSG", NETLINK_DNRTMSG);
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	4294 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4295 #ifdef NETLINK_TAPBASE
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	4296 PyModule_AddIntConstant(m, "NETLINK_TAPBASE", NETLINK_TAPBASE);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4297 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	4298 #endif /* AF_NETLINK */
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4299 #ifdef AF_ROUTE
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4300 /* Alias to emulate 4.4BSD */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4301 PyModule_AddIntConstant(m, "AF_ROUTE", AF_ROUTE);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4302 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4303 #ifdef AF_ASH
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4304 /* Ash */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4305 PyModule_AddIntConstant(m, "AF_ASH", AF_ASH);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4306 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4307 #ifdef AF_ECONET
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4308 /* Acorn Econet */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4309 PyModule_AddIntConstant(m, "AF_ECONET", AF_ECONET);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4310 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4311 #ifdef AF_ATMSVC
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4312 /* ATM SVCs */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4313 PyModule_AddIntConstant(m, "AF_ATMSVC", AF_ATMSVC);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4314 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4315 #ifdef AF_SNA
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4316 /* Linux SNA Project (nutters!) */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4317 PyModule_AddIntConstant(m, "AF_SNA", AF_SNA);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4318 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4319 #ifdef AF_IRDA
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4320 /* IRDA sockets */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4321 PyModule_AddIntConstant(m, "AF_IRDA", AF_IRDA);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4322 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4323 #ifdef AF_PPPOX
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4324 /* PPPoX sockets */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4325 PyModule_AddIntConstant(m, "AF_PPPOX", AF_PPPOX);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4326 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4327 #ifdef AF_WANPIPE
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4328 /* Wanpipe API Sockets */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4329 PyModule_AddIntConstant(m, "AF_WANPIPE", AF_WANPIPE);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4330 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4331 #ifdef AF_LLC
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4332 /* Linux LLC */
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4333 PyModule_AddIntConstant(m, "AF_LLC", AF_LLC);
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4334 #endif
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4335
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	4336 #ifdef USE_BLUETOOTH
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4337 PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4338 PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	4339 PyModule_AddIntConstant(m, "BTPROTO_HCI", BTPROTO_HCI);
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	4340 PyModule_AddIntConstant(m, "SOL_HCI", SOL_HCI);
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	4341 PyModule_AddIntConstant(m, "HCI_FILTER", HCI_FILTER);
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	4342 #if !defined(__FreeBSD__)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	4343 PyModule_AddIntConstant(m, "HCI_TIME_STAMP", HCI_TIME_STAMP);
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	4344 PyModule_AddIntConstant(m, "HCI_DATA_DIR", HCI_DATA_DIR);
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4345 PyModule_AddIntConstant(m, "BTPROTO_SCO", BTPROTO_SCO);
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	4346 #endif
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4347 PyModule_AddIntConstant(m, "BTPROTO_RFCOMM", BTPROTO_RFCOMM);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	4348 PyModule_AddStringConstant(m, "BDADDR_ANY", "00:00:00:00:00:00");
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	4349 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	4350 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4351
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	4352 #ifdef HAVE_NETPACKET_PACKET_H
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4353 PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4354 PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4355 PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4356 PyModule_AddIntConstant(m, "PACKET_BROADCAST", PACKET_BROADCAST);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4357 PyModule_AddIntConstant(m, "PACKET_MULTICAST", PACKET_MULTICAST);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4358 PyModule_AddIntConstant(m, "PACKET_OTHERHOST", PACKET_OTHERHOST);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4359 PyModule_AddIntConstant(m, "PACKET_OUTGOING", PACKET_OUTGOING);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4360 PyModule_AddIntConstant(m, "PACKET_LOOPBACK", PACKET_LOOPBACK);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4361 PyModule_AddIntConstant(m, "PACKET_FASTROUTE", PACKET_FASTROUTE);
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	4362 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4363
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4364 /* Socket types */
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4365 PyModule_AddIntConstant(m, "SOCK_STREAM", SOCK_STREAM);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4366 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	4367 #ifndef __BEOS__
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	4368 /* We have incomplete socket support. */
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4369 PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4370 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	4371 #if defined(SOCK_RDM)
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4372 PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	4373 #endif
26597 7ddea4dfa519 Patch #650422: Use Posix AF_ constants instead of PF_ ones. Martin v. Löwis <martin@v.loewis.de> parents: 26551 diff changeset	4374 #endif
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4375
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4376 #ifdef SO_DEBUG
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4377 PyModule_AddIntConstant(m, "SO_DEBUG", SO_DEBUG);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4378 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4379 #ifdef SO_ACCEPTCONN
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4380 PyModule_AddIntConstant(m, "SO_ACCEPTCONN", SO_ACCEPTCONN);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4381 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4382 #ifdef SO_REUSEADDR
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4383 PyModule_AddIntConstant(m, "SO_REUSEADDR", SO_REUSEADDR);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4384 #endif
32578 21fd6e62cd27 [Patch #982665 ] add SO_EXCLUSIVEADDRUSE constant Andrew M. Kuchling <amk@amk.ca> parents: 32521 diff changeset	4385 #ifdef SO_EXCLUSIVEADDRUSE
21fd6e62cd27 [Patch #982665 ] add SO_EXCLUSIVEADDRUSE constant Andrew M. Kuchling <amk@amk.ca> parents: 32521 diff changeset	4386 PyModule_AddIntConstant(m, "SO_EXCLUSIVEADDRUSE", SO_EXCLUSIVEADDRUSE);
21fd6e62cd27 [Patch #982665 ] add SO_EXCLUSIVEADDRUSE constant Andrew M. Kuchling <amk@amk.ca> parents: 32521 diff changeset	4387 #endif
21fd6e62cd27 [Patch #982665 ] add SO_EXCLUSIVEADDRUSE constant Andrew M. Kuchling <amk@amk.ca> parents: 32521 diff changeset	4388
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4389 #ifdef SO_KEEPALIVE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4390 PyModule_AddIntConstant(m, "SO_KEEPALIVE", SO_KEEPALIVE);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4391 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4392 #ifdef SO_DONTROUTE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4393 PyModule_AddIntConstant(m, "SO_DONTROUTE", SO_DONTROUTE);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4394 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4395 #ifdef SO_BROADCAST
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4396 PyModule_AddIntConstant(m, "SO_BROADCAST", SO_BROADCAST);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4397 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4398 #ifdef SO_USELOOPBACK
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4399 PyModule_AddIntConstant(m, "SO_USELOOPBACK", SO_USELOOPBACK);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4400 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4401 #ifdef SO_LINGER
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4402 PyModule_AddIntConstant(m, "SO_LINGER", SO_LINGER);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4403 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4404 #ifdef SO_OOBINLINE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4405 PyModule_AddIntConstant(m, "SO_OOBINLINE", SO_OOBINLINE);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4406 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4407 #ifdef SO_REUSEPORT
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4408 PyModule_AddIntConstant(m, "SO_REUSEPORT", SO_REUSEPORT);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4409 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4410 #ifdef SO_SNDBUF
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4411 PyModule_AddIntConstant(m, "SO_SNDBUF", SO_SNDBUF);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4412 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4413 #ifdef SO_RCVBUF
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4414 PyModule_AddIntConstant(m, "SO_RCVBUF", SO_RCVBUF);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4415 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4416 #ifdef SO_SNDLOWAT
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4417 PyModule_AddIntConstant(m, "SO_SNDLOWAT", SO_SNDLOWAT);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4418 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4419 #ifdef SO_RCVLOWAT
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4420 PyModule_AddIntConstant(m, "SO_RCVLOWAT", SO_RCVLOWAT);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4421 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4422 #ifdef SO_SNDTIMEO
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4423 PyModule_AddIntConstant(m, "SO_SNDTIMEO", SO_SNDTIMEO);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4424 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4425 #ifdef SO_RCVTIMEO
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4426 PyModule_AddIntConstant(m, "SO_RCVTIMEO", SO_RCVTIMEO);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4427 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4428 #ifdef SO_ERROR
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4429 PyModule_AddIntConstant(m, "SO_ERROR", SO_ERROR);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4430 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4431 #ifdef SO_TYPE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4432 PyModule_AddIntConstant(m, "SO_TYPE", SO_TYPE);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4433 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4434
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4435 /* Maximum number of connections for "listen" */
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4436 #ifdef SOMAXCONN
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4437 PyModule_AddIntConstant(m, "SOMAXCONN", SOMAXCONN);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4438 #else
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4439 PyModule_AddIntConstant(m, "SOMAXCONN", 5); /* Common value */
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4440 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4441
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4442 /* Flags for send, recv */
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4443 #ifdef MSG_OOB
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4444 PyModule_AddIntConstant(m, "MSG_OOB", MSG_OOB);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4445 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4446 #ifdef MSG_PEEK
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4447 PyModule_AddIntConstant(m, "MSG_PEEK", MSG_PEEK);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4448 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4449 #ifdef MSG_DONTROUTE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4450 PyModule_AddIntConstant(m, "MSG_DONTROUTE", MSG_DONTROUTE);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4451 #endif
12492 1725e802e3eb Patch by Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12479 diff changeset	4452 #ifdef MSG_DONTWAIT
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4453 PyModule_AddIntConstant(m, "MSG_DONTWAIT", MSG_DONTWAIT);
12492 1725e802e3eb Patch by Charles G Waldman: Guido van Rossum <guido@python.org> parents: 12479 diff changeset	4454 #endif
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4455 #ifdef MSG_EOR
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4456 PyModule_AddIntConstant(m, "MSG_EOR", MSG_EOR);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4457 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4458 #ifdef MSG_TRUNC
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4459 PyModule_AddIntConstant(m, "MSG_TRUNC", MSG_TRUNC);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4460 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4461 #ifdef MSG_CTRUNC
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4462 PyModule_AddIntConstant(m, "MSG_CTRUNC", MSG_CTRUNC);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4463 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4464 #ifdef MSG_WAITALL
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4465 PyModule_AddIntConstant(m, "MSG_WAITALL", MSG_WAITALL);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4466 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4467 #ifdef MSG_BTAG
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4468 PyModule_AddIntConstant(m, "MSG_BTAG", MSG_BTAG);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4469 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4470 #ifdef MSG_ETAG
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4471 PyModule_AddIntConstant(m, "MSG_ETAG", MSG_ETAG);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4472 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4473
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4474 /* Protocol level and numbers, usable for [gs]etsockopt */
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4475 #ifdef SOL_SOCKET
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4476 PyModule_AddIntConstant(m, "SOL_SOCKET", SOL_SOCKET);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4477 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4478 #ifdef SOL_IP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4479 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	4480 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4481 PyModule_AddIntConstant(m, "SOL_IP", 0);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4482 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4483 #ifdef SOL_IPX
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4484 PyModule_AddIntConstant(m, "SOL_IPX", SOL_IPX);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4485 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4486 #ifdef SOL_AX25
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4487 PyModule_AddIntConstant(m, "SOL_AX25", SOL_AX25);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4488 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4489 #ifdef SOL_ATALK
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4490 PyModule_AddIntConstant(m, "SOL_ATALK", SOL_ATALK);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4491 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4492 #ifdef SOL_NETROM
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4493 PyModule_AddIntConstant(m, "SOL_NETROM", SOL_NETROM);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4494 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4495 #ifdef SOL_ROSE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4496 PyModule_AddIntConstant(m, "SOL_ROSE", SOL_ROSE);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4497 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4498 #ifdef SOL_TCP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4499 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	4500 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4501 PyModule_AddIntConstant(m, "SOL_TCP", 6);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4502 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4503 #ifdef SOL_UDP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4504 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	4505 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4506 PyModule_AddIntConstant(m, "SOL_UDP", 17);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4507 #endif
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4508 #ifdef IPPROTO_IP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4509 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	4510 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4511 PyModule_AddIntConstant(m, "IPPROTO_IP", 0);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4512 #endif
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4513 #ifdef IPPROTO_HOPOPTS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4514 PyModule_AddIntConstant(m, "IPPROTO_HOPOPTS", IPPROTO_HOPOPTS);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4515 #endif
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4516 #ifdef IPPROTO_ICMP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4517 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	4518 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4519 PyModule_AddIntConstant(m, "IPPROTO_ICMP", 1);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4520 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4521 #ifdef IPPROTO_IGMP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4522 PyModule_AddIntConstant(m, "IPPROTO_IGMP", IPPROTO_IGMP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4523 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4524 #ifdef IPPROTO_GGP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4525 PyModule_AddIntConstant(m, "IPPROTO_GGP", IPPROTO_GGP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4526 #endif
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4527 #ifdef IPPROTO_IPV4
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4528 PyModule_AddIntConstant(m, "IPPROTO_IPV4", IPPROTO_IPV4);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4529 #endif
30630 9200712d31e7 Patch #813445: Add missing socket.IPPROTO_IPV6. Backported to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30081 diff changeset	4530 #ifdef IPPROTO_IPV6
9200712d31e7 Patch #813445: Add missing socket.IPPROTO_IPV6. Backported to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30081 diff changeset	4531 PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
9200712d31e7 Patch #813445: Add missing socket.IPPROTO_IPV6. Backported to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30081 diff changeset	4532 #endif
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4533 #ifdef IPPROTO_IPIP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4534 PyModule_AddIntConstant(m, "IPPROTO_IPIP", IPPROTO_IPIP);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4535 #endif
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4536 #ifdef IPPROTO_TCP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4537 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	4538 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4539 PyModule_AddIntConstant(m, "IPPROTO_TCP", 6);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4540 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4541 #ifdef IPPROTO_EGP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4542 PyModule_AddIntConstant(m, "IPPROTO_EGP", IPPROTO_EGP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4543 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4544 #ifdef IPPROTO_PUP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4545 PyModule_AddIntConstant(m, "IPPROTO_PUP", IPPROTO_PUP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4546 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4547 #ifdef IPPROTO_UDP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4548 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	4549 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4550 PyModule_AddIntConstant(m, "IPPROTO_UDP", 17);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4551 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4552 #ifdef IPPROTO_IDP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4553 PyModule_AddIntConstant(m, "IPPROTO_IDP", IPPROTO_IDP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4554 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4555 #ifdef IPPROTO_HELLO
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4556 PyModule_AddIntConstant(m, "IPPROTO_HELLO", IPPROTO_HELLO);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4557 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4558 #ifdef IPPROTO_ND
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4559 PyModule_AddIntConstant(m, "IPPROTO_ND", IPPROTO_ND);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4560 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4561 #ifdef IPPROTO_TP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4562 PyModule_AddIntConstant(m, "IPPROTO_TP", IPPROTO_TP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4563 #endif
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4564 #ifdef IPPROTO_IPV6
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4565 PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4566 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4567 #ifdef IPPROTO_ROUTING
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4568 PyModule_AddIntConstant(m, "IPPROTO_ROUTING", IPPROTO_ROUTING);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4569 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4570 #ifdef IPPROTO_FRAGMENT
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4571 PyModule_AddIntConstant(m, "IPPROTO_FRAGMENT", IPPROTO_FRAGMENT);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4572 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4573 #ifdef IPPROTO_RSVP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4574 PyModule_AddIntConstant(m, "IPPROTO_RSVP", IPPROTO_RSVP);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4575 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4576 #ifdef IPPROTO_GRE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4577 PyModule_AddIntConstant(m, "IPPROTO_GRE", IPPROTO_GRE);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4578 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4579 #ifdef IPPROTO_ESP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4580 PyModule_AddIntConstant(m, "IPPROTO_ESP", IPPROTO_ESP);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4581 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4582 #ifdef IPPROTO_AH
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4583 PyModule_AddIntConstant(m, "IPPROTO_AH", IPPROTO_AH);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4584 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4585 #ifdef IPPROTO_MOBILE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4586 PyModule_AddIntConstant(m, "IPPROTO_MOBILE", IPPROTO_MOBILE);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4587 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4588 #ifdef IPPROTO_ICMPV6
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4589 PyModule_AddIntConstant(m, "IPPROTO_ICMPV6", IPPROTO_ICMPV6);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4590 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4591 #ifdef IPPROTO_NONE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4592 PyModule_AddIntConstant(m, "IPPROTO_NONE", IPPROTO_NONE);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4593 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4594 #ifdef IPPROTO_DSTOPTS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4595 PyModule_AddIntConstant(m, "IPPROTO_DSTOPTS", IPPROTO_DSTOPTS);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4596 #endif
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4597 #ifdef IPPROTO_XTP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4598 PyModule_AddIntConstant(m, "IPPROTO_XTP", IPPROTO_XTP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4599 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4600 #ifdef IPPROTO_EON
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4601 PyModule_AddIntConstant(m, "IPPROTO_EON", IPPROTO_EON);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4602 #endif
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4603 #ifdef IPPROTO_PIM
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4604 PyModule_AddIntConstant(m, "IPPROTO_PIM", IPPROTO_PIM);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4605 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4606 #ifdef IPPROTO_IPCOMP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4607 PyModule_AddIntConstant(m, "IPPROTO_IPCOMP", IPPROTO_IPCOMP);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4608 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4609 #ifdef IPPROTO_VRRP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4610 PyModule_AddIntConstant(m, "IPPROTO_VRRP", IPPROTO_VRRP);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4611 #endif
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4612 #ifdef IPPROTO_BIP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4613 PyModule_AddIntConstant(m, "IPPROTO_BIP", IPPROTO_BIP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4614 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4615 /**/
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4616 #ifdef IPPROTO_RAW
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4617 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	4618 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4619 PyModule_AddIntConstant(m, "IPPROTO_RAW", 255);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4620 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4621 #ifdef IPPROTO_MAX
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4622 PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4623 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4624
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4625 /* Some port configuration */
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4626 #ifdef IPPORT_RESERVED
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4627 PyModule_AddIntConstant(m, "IPPORT_RESERVED", IPPORT_RESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4628 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4629 PyModule_AddIntConstant(m, "IPPORT_RESERVED", 1024);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4630 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4631 #ifdef IPPORT_USERRESERVED
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4632 PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", IPPORT_USERRESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4633 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4634 PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", 5000);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4635 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4636
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4637 /* Some reserved IP v.4 addresses */
ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4638 #ifdef INADDR_ANY
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4639 PyModule_AddIntConstant(m, "INADDR_ANY", INADDR_ANY);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4640 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4641 PyModule_AddIntConstant(m, "INADDR_ANY", 0x00000000);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4642 #endif
ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4643 #ifdef INADDR_BROADCAST
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4644 PyModule_AddIntConstant(m, "INADDR_BROADCAST", INADDR_BROADCAST);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4645 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4646 PyModule_AddIntConstant(m, "INADDR_BROADCAST", 0xffffffff);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4647 #endif
ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4648 #ifdef INADDR_LOOPBACK
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4649 PyModule_AddIntConstant(m, "INADDR_LOOPBACK", INADDR_LOOPBACK);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4650 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4651 PyModule_AddIntConstant(m, "INADDR_LOOPBACK", 0x7F000001);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4652 #endif
ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4653 #ifdef INADDR_UNSPEC_GROUP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4654 PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4655 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4656 PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", 0xe0000000);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4657 #endif
ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4658 #ifdef INADDR_ALLHOSTS_GROUP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4659 PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP",
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4660 INADDR_ALLHOSTS_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4661 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4662 PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP", 0xe0000001);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4663 #endif
ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4664 #ifdef INADDR_MAX_LOCAL_GROUP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4665 PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP",
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4666 INADDR_MAX_LOCAL_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4667 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4668 PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4669 #endif
ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4670 #ifdef INADDR_NONE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4671 PyModule_AddIntConstant(m, "INADDR_NONE", INADDR_NONE);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4672 #else
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4673 PyModule_AddIntConstant(m, "INADDR_NONE", 0xffffffff);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4674 #endif
ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4675
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4676 /* IPv4 [gs]etsockopt options */
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4677 #ifdef IP_OPTIONS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4678 PyModule_AddIntConstant(m, "IP_OPTIONS", IP_OPTIONS);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4679 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4680 #ifdef IP_HDRINCL
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4681 PyModule_AddIntConstant(m, "IP_HDRINCL", IP_HDRINCL);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4682 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4683 #ifdef IP_TOS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4684 PyModule_AddIntConstant(m, "IP_TOS", IP_TOS);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4685 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4686 #ifdef IP_TTL
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4687 PyModule_AddIntConstant(m, "IP_TTL", IP_TTL);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4688 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4689 #ifdef IP_RECVOPTS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4690 PyModule_AddIntConstant(m, "IP_RECVOPTS", IP_RECVOPTS);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4691 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4692 #ifdef IP_RECVRETOPTS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4693 PyModule_AddIntConstant(m, "IP_RECVRETOPTS", IP_RECVRETOPTS);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4694 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4695 #ifdef IP_RECVDSTADDR
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4696 PyModule_AddIntConstant(m, "IP_RECVDSTADDR", IP_RECVDSTADDR);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4697 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4698 #ifdef IP_RETOPTS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4699 PyModule_AddIntConstant(m, "IP_RETOPTS", IP_RETOPTS);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4700 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4701 #ifdef IP_MULTICAST_IF
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4702 PyModule_AddIntConstant(m, "IP_MULTICAST_IF", IP_MULTICAST_IF);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4703 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4704 #ifdef IP_MULTICAST_TTL
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4705 PyModule_AddIntConstant(m, "IP_MULTICAST_TTL", IP_MULTICAST_TTL);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4706 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4707 #ifdef IP_MULTICAST_LOOP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4708 PyModule_AddIntConstant(m, "IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4709 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4710 #ifdef IP_ADD_MEMBERSHIP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4711 PyModule_AddIntConstant(m, "IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4712 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4713 #ifdef IP_DROP_MEMBERSHIP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4714 PyModule_AddIntConstant(m, "IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4715 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4716 #ifdef IP_DEFAULT_MULTICAST_TTL
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4717 PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_TTL",
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4718 IP_DEFAULT_MULTICAST_TTL);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4719 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4720 #ifdef IP_DEFAULT_MULTICAST_LOOP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4721 PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_LOOP",
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4722 IP_DEFAULT_MULTICAST_LOOP);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4723 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4724 #ifdef IP_MAX_MEMBERSHIPS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4725 PyModule_AddIntConstant(m, "IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4726 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4727
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4728 /* IPv6 [gs]etsockopt options, defined in RFC2553 */
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4729 #ifdef IPV6_JOIN_GROUP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4730 PyModule_AddIntConstant(m, "IPV6_JOIN_GROUP", IPV6_JOIN_GROUP);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4731 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4732 #ifdef IPV6_LEAVE_GROUP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4733 PyModule_AddIntConstant(m, "IPV6_LEAVE_GROUP", IPV6_LEAVE_GROUP);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4734 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4735 #ifdef IPV6_MULTICAST_HOPS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4736 PyModule_AddIntConstant(m, "IPV6_MULTICAST_HOPS", IPV6_MULTICAST_HOPS);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4737 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4738 #ifdef IPV6_MULTICAST_IF
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4739 PyModule_AddIntConstant(m, "IPV6_MULTICAST_IF", IPV6_MULTICAST_IF);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4740 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4741 #ifdef IPV6_MULTICAST_LOOP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4742 PyModule_AddIntConstant(m, "IPV6_MULTICAST_LOOP", IPV6_MULTICAST_LOOP);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4743 #endif
9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4744 #ifdef IPV6_UNICAST_HOPS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4745 PyModule_AddIntConstant(m, "IPV6_UNICAST_HOPS", IPV6_UNICAST_HOPS);
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4746 #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	4747 /* Additional IPV6 socket options, defined in RFC 3493 */
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4748 #ifdef IPV6_V6ONLY
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4749 PyModule_AddIntConstant(m, "IPV6_V6ONLY", IPV6_V6ONLY);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4750 #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	4751 /* Advanced IPV6 socket options, from RFC 3542 */
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4752 #ifdef IPV6_CHECKSUM
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4753 PyModule_AddIntConstant(m, "IPV6_CHECKSUM", IPV6_CHECKSUM);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4754 #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	4755 #ifdef IPV6_DONTFRAG
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4756 PyModule_AddIntConstant(m, "IPV6_DONTFRAG", IPV6_DONTFRAG);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4757 #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	4758 #ifdef IPV6_DSTOPTS
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4759 PyModule_AddIntConstant(m, "IPV6_DSTOPTS", IPV6_DSTOPTS);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4760 #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	4761 #ifdef IPV6_HOPLIMIT
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4762 PyModule_AddIntConstant(m, "IPV6_HOPLIMIT", IPV6_HOPLIMIT);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4763 #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	4764 #ifdef IPV6_HOPOPTS
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4765 PyModule_AddIntConstant(m, "IPV6_HOPOPTS", IPV6_HOPOPTS);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4766 #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	4767 #ifdef IPV6_NEXTHOP
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4768 PyModule_AddIntConstant(m, "IPV6_NEXTHOP", IPV6_NEXTHOP);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4769 #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	4770 #ifdef IPV6_PATHMTU
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4771 PyModule_AddIntConstant(m, "IPV6_PATHMTU", IPV6_PATHMTU);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4772 #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	4773 #ifdef IPV6_PKTINFO
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4774 PyModule_AddIntConstant(m, "IPV6_PKTINFO", IPV6_PKTINFO);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4775 #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	4776 #ifdef IPV6_RECVDSTOPTS
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4777 PyModule_AddIntConstant(m, "IPV6_RECVDSTOPTS", IPV6_RECVDSTOPTS);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4778 #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	4779 #ifdef IPV6_RECVHOPLIMIT
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4780 PyModule_AddIntConstant(m, "IPV6_RECVHOPLIMIT", IPV6_RECVHOPLIMIT);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4781 #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	4782 #ifdef IPV6_RECVHOPOPTS
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4783 PyModule_AddIntConstant(m, "IPV6_RECVHOPOPTS", IPV6_RECVHOPOPTS);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4784 #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	4785 #ifdef IPV6_RECVPKTINFO
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4786 PyModule_AddIntConstant(m, "IPV6_RECVPKTINFO", IPV6_RECVPKTINFO);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4787 #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	4788 #ifdef IPV6_RECVRTHDR
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4789 PyModule_AddIntConstant(m, "IPV6_RECVRTHDR", IPV6_RECVRTHDR);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4790 #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	4791 #ifdef IPV6_RECVTCLASS
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4792 PyModule_AddIntConstant(m, "IPV6_RECVTCLASS", IPV6_RECVTCLASS);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4793 #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	4794 #ifdef IPV6_RTHDR
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4795 PyModule_AddIntConstant(m, "IPV6_RTHDR", IPV6_RTHDR);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4796 #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	4797 #ifdef IPV6_RTHDRDSTOPTS
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4798 PyModule_AddIntConstant(m, "IPV6_RTHDRDSTOPTS", IPV6_RTHDRDSTOPTS);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4799 #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	4800 #ifdef IPV6_RTHDR_TYPE_0
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4801 PyModule_AddIntConstant(m, "IPV6_RTHDR_TYPE_0", IPV6_RTHDR_TYPE_0);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4802 #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	4803 #ifdef IPV6_RECVPATHMTU
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4804 PyModule_AddIntConstant(m, "IPV6_RECVPATHMTU", IPV6_RECVPATHMTU);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4805 #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	4806 #ifdef IPV6_TCLASS
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4807 PyModule_AddIntConstant(m, "IPV6_TCLASS", IPV6_TCLASS);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4808 #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	4809 #ifdef IPV6_USE_MIN_MTU
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4810 PyModule_AddIntConstant(m, "IPV6_USE_MIN_MTU", IPV6_USE_MIN_MTU);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4811 #endif
18997 9fc4a5abb369 Add more constants. Contributed by itojun. Martin v. Löwis <martin@v.loewis.de> parents: 18996 diff changeset	4812
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4813 /* TCP options */
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4814 #ifdef TCP_NODELAY
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4815 PyModule_AddIntConstant(m, "TCP_NODELAY", TCP_NODELAY);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4816 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4817 #ifdef TCP_MAXSEG
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4818 PyModule_AddIntConstant(m, "TCP_MAXSEG", TCP_MAXSEG);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4819 #endif
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4820 #ifdef TCP_CORK
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4821 PyModule_AddIntConstant(m, "TCP_CORK", TCP_CORK);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4822 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4823 #ifdef TCP_KEEPIDLE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4824 PyModule_AddIntConstant(m, "TCP_KEEPIDLE", TCP_KEEPIDLE);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4825 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4826 #ifdef TCP_KEEPINTVL
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4827 PyModule_AddIntConstant(m, "TCP_KEEPINTVL", TCP_KEEPINTVL);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4828 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4829 #ifdef TCP_KEEPCNT
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4830 PyModule_AddIntConstant(m, "TCP_KEEPCNT", TCP_KEEPCNT);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4831 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4832 #ifdef TCP_SYNCNT
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4833 PyModule_AddIntConstant(m, "TCP_SYNCNT", TCP_SYNCNT);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4834 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4835 #ifdef TCP_LINGER2
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4836 PyModule_AddIntConstant(m, "TCP_LINGER2", TCP_LINGER2);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4837 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4838 #ifdef TCP_DEFER_ACCEPT
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4839 PyModule_AddIntConstant(m, "TCP_DEFER_ACCEPT", TCP_DEFER_ACCEPT);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4840 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4841 #ifdef TCP_WINDOW_CLAMP
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4842 PyModule_AddIntConstant(m, "TCP_WINDOW_CLAMP", TCP_WINDOW_CLAMP);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4843 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4844 #ifdef TCP_INFO
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4845 PyModule_AddIntConstant(m, "TCP_INFO", TCP_INFO);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4846 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4847 #ifdef TCP_QUICKACK
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4848 PyModule_AddIntConstant(m, "TCP_QUICKACK", TCP_QUICKACK);
21526 349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4849 #endif
349d66cd874c Add TCP socket options from glibc 2.2.4. Fixes #495680. Martin v. Löwis <martin@v.loewis.de> parents: 21128 diff changeset	4850
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4851
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4852 /* IPX options */
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4853 #ifdef IPX_TYPE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4854 PyModule_AddIntConstant(m, "IPX_TYPE", IPX_TYPE);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4855 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	4856
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4857 /* get{addr,name}info parameters */
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4858 #ifdef EAI_ADDRFAMILY
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4859 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	4860 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4861 #ifdef EAI_AGAIN
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4862 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	4863 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4864 #ifdef EAI_BADFLAGS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4865 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	4866 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4867 #ifdef EAI_FAIL
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4868 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	4869 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4870 #ifdef EAI_FAMILY
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4871 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	4872 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4873 #ifdef EAI_MEMORY
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4874 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	4875 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4876 #ifdef EAI_NODATA
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4877 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	4878 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4879 #ifdef EAI_NONAME
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4880 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	4881 #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	4882 #ifdef EAI_OVERFLOW
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4883 PyModule_AddIntConstant(m, "EAI_OVERFLOW", EAI_OVERFLOW);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4884 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4885 #ifdef EAI_SERVICE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4886 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	4887 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4888 #ifdef EAI_SOCKTYPE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4889 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	4890 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4891 #ifdef EAI_SYSTEM
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4892 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	4893 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4894 #ifdef EAI_BADHINTS
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4895 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	4896 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4897 #ifdef EAI_PROTOCOL
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4898 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	4899 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4900 #ifdef EAI_MAX
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4901 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	4902 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4903 #ifdef AI_PASSIVE
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4904 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	4905 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4906 #ifdef AI_CANONNAME
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4907 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	4908 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4909 #ifdef AI_NUMERICHOST
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4910 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	4911 #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	4912 #ifdef AI_NUMERICSERV
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4913 PyModule_AddIntConstant(m, "AI_NUMERICSERV", AI_NUMERICSERV);
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	4914 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4915 #ifdef AI_MASK
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4916 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	4917 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4918 #ifdef AI_ALL
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4919 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	4920 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4921 #ifdef AI_V4MAPPED_CFG
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4922 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	4923 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4924 #ifdef AI_ADDRCONFIG
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4925 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	4926 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4927 #ifdef AI_V4MAPPED
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4928 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	4929 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4930 #ifdef AI_DEFAULT
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4931 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	4932 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4933 #ifdef NI_MAXHOST
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4934 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	4935 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4936 #ifdef NI_MAXSERV
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4937 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	4938 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4939 #ifdef NI_NOFQDN
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4940 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	4941 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4942 #ifdef NI_NUMERICHOST
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4943 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	4944 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4945 #ifdef NI_NAMEREQD
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4946 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	4947 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4948 #ifdef NI_NUMERICSERV
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4949 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	4950 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4951 #ifdef NI_DGRAM
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22568 diff changeset	4952 PyModule_AddIntConstant(m, "NI_DGRAM", NI_DGRAM);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4953 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4954
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4955 /* shutdown() parameters */
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4956 #ifdef SHUT_RD
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4957 PyModule_AddIntConstant(m, "SHUT_RD", SHUT_RD);
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4958 #elif defined(SD_RECEIVE)
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4959 PyModule_AddIntConstant(m, "SHUT_RD", SD_RECEIVE);
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4960 #else
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4961 PyModule_AddIntConstant(m, "SHUT_RD", 0);
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4962 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4963 #ifdef SHUT_WR
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4964 PyModule_AddIntConstant(m, "SHUT_WR", SHUT_WR);
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4965 #elif defined(SD_SEND)
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4966 PyModule_AddIntConstant(m, "SHUT_WR", SD_SEND);
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4967 #else
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4968 PyModule_AddIntConstant(m, "SHUT_WR", 1);
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4969 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4970 #ifdef SHUT_RDWR
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4971 PyModule_AddIntConstant(m, "SHUT_RDWR", SHUT_RDWR);
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4972 #elif defined(SD_BOTH)
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4973 PyModule_AddIntConstant(m, "SHUT_RDWR", SD_BOTH);
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4974 #else
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4975 PyModule_AddIntConstant(m, "SHUT_RDWR", 2);
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4976 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	4977
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	4978 /* Initialize gethostbyname lock */
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	4979 #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	4980 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	4981 #endif
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4982 }
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	4983
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4984
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4985 #ifndef HAVE_INET_PTON
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4986
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	4987 /* 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	4988 /* 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	4989
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4990 int
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4991 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	4992 {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4993 if (af == AF_INET) {
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	4994 long packed_addr;
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	4995 packed_addr = inet_addr(src);
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	4996 if (packed_addr == INADDR_NONE)
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	4997 return 0;
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	4998 memcpy(dst, &packed_addr, 4);
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	4999 return 1;
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5000 }
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5001 /* Should set errno to EAFNOSUPPORT */
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5002 return -1;
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5003 }
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5004
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	5005 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	5006 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	5007 {
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5008 if (af == AF_INET) {
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5009 struct in_addr packed_addr;
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5010 if (size < 16)
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5011 /* Should set errno to ENOSPC. */
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5012 return NULL;
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5013 memcpy(&packed_addr, src, sizeof(packed_addr));
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5014 return strncpy(dst, inet_ntoa(packed_addr), size);
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5015 }
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5016 /* Should set errno to EAFNOSUPPORT */
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5017 return NULL;
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5018 }
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5019
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	5020 #endif

Mercurial > cpython-lru_cache-weakref

annotate Modules/socketmodule.c @ 42257:c280647c330c