mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line Moved include "Python.h" in front of other imports to silence a warning. ........ r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines Minor fix-ups to named tuples: * Make the _replace() method respect subclassing. * Using property() to make _fields read-only wasn't a good idea. It caused len(Point._fields) to fail. * Add note to _cast() about length checking and alternative with the star-operator. ........ r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines Make math.{floor,ceil}({int,long}) return float again for backwards compatibility after r59671 made them return integral types. ........ r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint. ........ r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines Issue #1735: TarFile.extractall() now correctly sets directory permissions and times. (will backport to 2.5) ........ r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line Update links to bug/patch tracker ........ r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line Added interface to Windows' WSAIoctl and a simple example for a network sniffer. ........ r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro! ........ r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line Reverted last transaction. It's the wrong branch. ........ r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line socket.ioctl is only available on Windows ........ r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line Fix markup ........ r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line Fix markup ........ r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000 and adds errors for -0x. ........ r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py. ........ r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line Improve namedtuple's _cast() method with a docstring, new name, and error-checking. ........ r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line Add error-checking to namedtuple's _replace() method. ........ r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines clean up a comment ........ r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines Continue rolling back pep-3141 changes that changed behavior from 2.5. This round included: * Revert round to its 2.6 behavior (half away from 0). * Because round, floor, and ceil always return float again, it's no longer necessary to have them delegate to __xxx___, so I've ripped that out of their implementations and the Real ABC. This also helps in implementing types that work in both 2.6 and 3.0: you return int from the __xxx__ methods, and let it get enabled by the version upgrade. * Make pow(-1, .5) raise a ValueError again. ........ r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line Fix comment typo ........ r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line Add myself. ........ r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines Fix C++-style comment. ........ r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines Remove with_statement future imports from 2.6 docs. ........ r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines Simplify index entries; fix #1712. ........ r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst. ........ r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines Revert socket.rst to unix-eol. ........ r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines Set native svn:eol-style property for text files. ........ r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines #1719: capitalization error in "UuidCreate". ........ r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines Repair markup. ........ r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines Use markup. ........ r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line Final adjustments for #1601 ........ r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'. Fix by John Nagle. ........ r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines Add John Nagle (of issue #1637). ........ r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line Small code simplification. Forgot that classmethods can be called from intances. ........ r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines Use vcbuild for VS 2009. ........ r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines Package using VS 2008. ........ r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines Don't try to package msvcr90 for the moment. ........ r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines #1696393: don't check for '.' and '..' in ntpath.walk since they aren't returned from os.listdir anymore. Reported by Michael Haggerty. ........ r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines #1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir. Reported by Jesse Towner. ........ r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines #1591: Clarify docstring of Popen3. ........ r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines #1680: fix context manager example function name. ........ r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines #1755097: document default values for [].sort() and sorted(). ........
256 lines
6.3 KiB
C
256 lines
6.3 KiB
C
/* Socket module header file */
|
|
|
|
/* Includes needed for the sockaddr_* symbols below */
|
|
#ifndef MS_WINDOWS
|
|
#ifdef __VMS
|
|
# include <socket.h>
|
|
# else
|
|
# include <sys/socket.h>
|
|
# endif
|
|
# include <netinet/in.h>
|
|
# if !(defined(__CYGWIN__) || (defined(PYOS_OS2) && defined(PYCC_VACPP)))
|
|
# include <netinet/tcp.h>
|
|
# endif
|
|
|
|
#else /* MS_WINDOWS */
|
|
#if _MSC_VER >= 1300
|
|
# include <winsock2.h>
|
|
# include <ws2tcpip.h>
|
|
# include <MSTcpIP.h> /* for SIO_RCVALL */
|
|
# define HAVE_ADDRINFO
|
|
# define HAVE_SOCKADDR_STORAGE
|
|
# define HAVE_GETADDRINFO
|
|
# define HAVE_GETNAMEINFO
|
|
# define ENABLE_IPV6
|
|
#else
|
|
# define WIN32_LEAN_AND_MEAN
|
|
# include <winsock.h>
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
# include <sys/un.h>
|
|
#else
|
|
# undef AF_UNIX
|
|
#endif
|
|
|
|
#ifdef HAVE_LINUX_NETLINK_H
|
|
# ifdef HAVE_ASM_TYPES_H
|
|
# include <asm/types.h>
|
|
# endif
|
|
# include <linux/netlink.h>
|
|
#else
|
|
# undef AF_NETLINK
|
|
#endif
|
|
|
|
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
|
|
#include <bluetooth/bluetooth.h>
|
|
#include <bluetooth/rfcomm.h>
|
|
#include <bluetooth/l2cap.h>
|
|
#include <bluetooth/sco.h>
|
|
#include <bluetooth/hci.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_BLUETOOTH_H
|
|
#include <bluetooth.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
# include <sys/ioctl.h>
|
|
# include <net/if.h>
|
|
# include <netpacket/packet.h>
|
|
#endif
|
|
|
|
#ifndef Py__SOCKET_H
|
|
#define Py__SOCKET_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Python module and C API name */
|
|
#define PySocket_MODULE_NAME "_socket"
|
|
#define PySocket_CAPI_NAME "CAPI"
|
|
|
|
/* Abstract the socket file descriptor type */
|
|
#ifdef MS_WINDOWS
|
|
typedef SOCKET SOCKET_T;
|
|
# ifdef MS_WIN64
|
|
# define SIZEOF_SOCKET_T 8
|
|
# else
|
|
# define SIZEOF_SOCKET_T 4
|
|
# endif
|
|
#else
|
|
typedef int SOCKET_T;
|
|
# define SIZEOF_SOCKET_T SIZEOF_INT
|
|
#endif
|
|
|
|
/* Socket address */
|
|
typedef union sock_addr {
|
|
struct sockaddr_in in;
|
|
#ifdef AF_UNIX
|
|
struct sockaddr_un un;
|
|
#endif
|
|
#ifdef AF_NETLINK
|
|
struct sockaddr_nl nl;
|
|
#endif
|
|
#ifdef ENABLE_IPV6
|
|
struct sockaddr_in6 in6;
|
|
struct sockaddr_storage storage;
|
|
#endif
|
|
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
|
|
struct sockaddr_l2 bt_l2;
|
|
struct sockaddr_rc bt_rc;
|
|
struct sockaddr_sco bt_sco;
|
|
struct sockaddr_hci bt_hci;
|
|
#endif
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
struct sockaddr_ll ll;
|
|
#endif
|
|
} sock_addr_t;
|
|
|
|
/* The object holding a socket. It holds some extra information,
|
|
like the address family, which is used to decode socket address
|
|
arguments properly. */
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
SOCKET_T sock_fd; /* Socket file descriptor */
|
|
int sock_family; /* Address family, e.g., AF_INET */
|
|
int sock_type; /* Socket type, e.g., SOCK_STREAM */
|
|
int sock_proto; /* Protocol type, usually 0 */
|
|
PyObject *(*errorhandler)(void); /* Error handler; checks
|
|
errno, returns NULL and
|
|
sets a Python exception */
|
|
double sock_timeout; /* Operation timeout in seconds;
|
|
0.0 means non-blocking */
|
|
} PySocketSockObject;
|
|
|
|
/* --- C API ----------------------------------------------------*/
|
|
|
|
/* Short explanation of what this C API export mechanism does
|
|
and how it works:
|
|
|
|
The _ssl module needs access to the type object defined in
|
|
the _socket module. Since cross-DLL linking introduces a lot of
|
|
problems on many platforms, the "trick" is to wrap the
|
|
C API of a module in a struct which then gets exported to
|
|
other modules via a PyCObject.
|
|
|
|
The code in socketmodule.c defines this struct (which currently
|
|
only contains the type object reference, but could very
|
|
well also include other C APIs needed by other modules)
|
|
and exports it as PyCObject via the module dictionary
|
|
under the name "CAPI".
|
|
|
|
Other modules can now include the socketmodule.h file
|
|
which defines the needed C APIs to import and set up
|
|
a static copy of this struct in the importing module.
|
|
|
|
After initialization, the importing module can then
|
|
access the C APIs from the _socket module by simply
|
|
referring to the static struct, e.g.
|
|
|
|
Load _socket module and its C API; this sets up the global
|
|
PySocketModule:
|
|
|
|
if (PySocketModule_ImportModuleAndAPI())
|
|
return;
|
|
|
|
|
|
Now use the C API as if it were defined in the using
|
|
module:
|
|
|
|
if (!PyArg_ParseTuple(args, "O!|zz:ssl",
|
|
|
|
PySocketModule.Sock_Type,
|
|
|
|
(PyObject*)&Sock,
|
|
&key_file, &cert_file))
|
|
return NULL;
|
|
|
|
Support could easily be extended to export more C APIs/symbols
|
|
this way. Currently, only the type object is exported,
|
|
other candidates would be socket constructors and socket
|
|
access functions.
|
|
|
|
*/
|
|
|
|
/* C API for usage by other Python modules */
|
|
typedef struct {
|
|
PyTypeObject *Sock_Type;
|
|
PyObject *error;
|
|
} PySocketModule_APIObject;
|
|
|
|
/* XXX The net effect of the following appears to be to define a function
|
|
XXX named PySocketModule_APIObject in _ssl.c. It's unclear why it isn't
|
|
XXX defined there directly.
|
|
|
|
>>> It's defined here because other modules might also want to use
|
|
>>> the C API.
|
|
|
|
*/
|
|
#ifndef PySocket_BUILDING_SOCKET
|
|
|
|
/* --- C API ----------------------------------------------------*/
|
|
|
|
/* Interfacestructure to C API for other modules.
|
|
Call PySocketModule_ImportModuleAndAPI() to initialize this
|
|
structure. After that usage is simple:
|
|
|
|
if (!PyArg_ParseTuple(args, "O!|zz:ssl",
|
|
&PySocketModule.Sock_Type, (PyObject*)&Sock,
|
|
&key_file, &cert_file))
|
|
return NULL;
|
|
...
|
|
*/
|
|
|
|
static
|
|
PySocketModule_APIObject PySocketModule;
|
|
|
|
/* You *must* call this before using any of the functions in
|
|
PySocketModule and check its outcome; otherwise all accesses will
|
|
result in a segfault. Returns 0 on success. */
|
|
|
|
#ifndef DPRINTF
|
|
# define DPRINTF if (0) printf
|
|
#endif
|
|
|
|
static
|
|
int PySocketModule_ImportModuleAndAPI(void)
|
|
{
|
|
PyObject *mod = 0, *v = 0;
|
|
char *apimodule = PySocket_MODULE_NAME;
|
|
char *apiname = PySocket_CAPI_NAME;
|
|
void *api;
|
|
|
|
DPRINTF("Importing the %s C API...\n", apimodule);
|
|
mod = PyImport_ImportModuleNoBlock(apimodule);
|
|
if (mod == NULL)
|
|
goto onError;
|
|
DPRINTF(" %s package found\n", apimodule);
|
|
v = PyObject_GetAttrString(mod, apiname);
|
|
if (v == NULL)
|
|
goto onError;
|
|
Py_DECREF(mod);
|
|
DPRINTF(" API object %s found\n", apiname);
|
|
api = PyCObject_AsVoidPtr(v);
|
|
if (api == NULL)
|
|
goto onError;
|
|
Py_DECREF(v);
|
|
memcpy(&PySocketModule, api, sizeof(PySocketModule));
|
|
DPRINTF(" API object loaded and initialized.\n");
|
|
return 0;
|
|
|
|
onError:
|
|
DPRINTF(" not found.\n");
|
|
Py_XDECREF(mod);
|
|
Py_XDECREF(v);
|
|
return -1;
|
|
}
|
|
|
|
#endif /* !PySocket_BUILDING_SOCKET */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py__SOCKET_H */
|