Changeset 388 for python/vendor/current/Modules/socketmodule.h

Timestamp:

Mar 19, 2014, 11:11:30 AM (11 years ago)

Author:

dmik

Message:

python: Update vendor to 2.7.6.

File:

• python/vendor/current/Modules/socketmodule.h (modified) (9 diffs)

python/vendor/current/Modules/socketmodule.h

@@ -18 +18 @@
 /* VC6 is shipped with old platform headers, and does not have MSTcpIP.h
  * Separate SDKs have all the functions we want, but older ones don't have
- * any version information. 
+ * any version information.
  * I use SIO_GET_MULTICAST_FILTER to detect a decent SDK.
  */
@@ -77 +77 @@
 
 /* Python module and C API name */
-#define PySocket_MODULE_NAME    "_socket"
-#define PySocket_CAPI_NAME      "CAPI"
+#define PySocket_MODULE_NAME    "_socket"
+#define PySocket_CAPI_NAME      "CAPI"
+#define PySocket_CAPSULE_NAME  (PySocket_MODULE_NAME "." PySocket_CAPI_NAME)
 
 /* 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
+#       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
+#       define SIZEOF_SOCKET_T SIZEOF_INT
 #endif
 
 /* Socket address */
 typedef union sock_addr {
-        struct sockaddr_in in;
+    struct sockaddr_in in;
 #ifdef AF_UNIX
-        struct sockaddr_un un;
+    struct sockaddr_un un;
 #endif
 #ifdef AF_NETLINK
-        struct sockaddr_nl nl;
+    struct sockaddr_nl nl;
 #endif
 #ifdef ENABLE_IPV6
-        struct sockaddr_in6 in6;
-        struct sockaddr_storage storage;
+    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;
+    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;
+    struct sockaddr_ll ll;
 #endif
 } sock_addr_t;
@@ -122 +123 @@
 
 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 */
+    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;
 
@@ -139 +140 @@
    and how it works:
 
-    The _ssl module needs access to the type object defined in 
+    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.
+    other modules via a PyCapsule.
 
     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
+    and exports it as PyCapsule via the module dictionary
     under the name "CAPI".
 
@@ -161 +162 @@
     Load _socket module and its C API; this sets up the global
     PySocketModule:
-    
-        if (PySocketModule_ImportModuleAndAPI())
-            return;
+
+    if (PySocketModule_ImportModuleAndAPI())
+        return;
 
 
@@ -169 +170 @@
     module:
 
-        if (!PyArg_ParseTuple(args, "O!|zz:ssl",
-
-                              PySocketModule.Sock_Type,
-
-                              (PyObject*)&Sock,
-                              &key_file, &cert_file))
-            return NULL;
+    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, 
+    this way. Currently, only the type object is exported,
     other candidates would be socket constructors and socket
     access functions.
@@ -186 +187 @@
 /* C API for usage by other Python modules */
 typedef struct {
-        PyTypeObject *Sock_Type;
-        PyObject *error;
+    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. 
+   XXX defined there directly.
 
    >>> It's defined here because other modules might also want to use
@@ -208 +209 @@
    if (!PyArg_ParseTuple(args, "O!|zz:ssl",
                          &PySocketModule.Sock_Type, (PyObject*)&Sock,
-                         &key_file, &cert_file))
-         return NULL;
+                         &key_file, &cert_file))
+     return NULL;
    ...
 */
@@ -227 +228 @@
 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;
+    void *api;
+
+  DPRINTF(" Loading capsule %s\n", PySocket_CAPSULE_NAME);
+  api = PyCapsule_Import(PySocket_CAPSULE_NAME, 1);
+    if (api == NULL)
+        goto onError;
+    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;
+    DPRINTF(" not found.\n");
+    return -1;
 }