Redactor to expose socket_import_file_descriptor()

diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 9158ca49072c078043ace9f84605da5df65849d2..3138eb60c45c6a696a596e09a09776cdc6a04f5b 100644 (file)
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -88,6 +88,7 @@ ZEND_END_MODULE_GLOBALS(sockets)
 ZEND_EXTERN_MODULE_GLOBALS(sockets);
 
 char *sockets_strerror(int error TSRMLS_DC);
+php_socket *socket_import_file_descriptor(PHP_SOCKET sock TSRMLS_DC);
 
 #define PHP_SOCKET_ERROR(socket,msg,errn) \
                socket->error = errn;   \

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 863825df13fd0e92adc7c222055cf0dafad6389a..449be8f9373b692bc553d1d68ed32dfeeb7fd5a2 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -2426,41 +2426,25 @@ PHP_FUNCTION(socket_clear_error)
 }
 /* }}} */
 
-/* {{{ proto void socket_import_stream(resource stream)
-   Imports a stream that encapsulates a socket into a socket extension resource. */
-PHP_FUNCTION(socket_import_stream)
+php_socket *socket_import_file_descriptor(PHP_SOCKET socket TSRMLS_DC)
 {
-       zval                             *zstream;
-       php_stream                       *stream;
-       php_socket                       *retsock = NULL;
-       PHP_SOCKET                       socket; /* fd */
-       php_sockaddr_storage addr;
-       socklen_t                        addr_len = sizeof(addr);
+#ifdef SO_DOMAIN
+       int                                             type;
+       socklen_t                               type_len = sizeof(type);
+#endif
+       php_socket                              *retsock;
+       php_sockaddr_storage    addr;
+       socklen_t                               addr_len = sizeof(addr);
 #ifndef PHP_WIN32
        int                                      t;
 #endif
-#ifdef SO_DOMAIN
-       int                                     type;
-       socklen_t                       type_len = sizeof(type);
-#endif
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) {
-               return;
-       }
-       php_stream_from_zval(stream, &zstream);
-
-       if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void**)&socket, 1)) {
-               /* error supposedly already shown */
-               RETURN_FALSE;
-       }
-
-       retsock = php_create_socket();
+    retsock = php_create_socket();
+    retsock->bsd_socket = socket;
 
-       retsock->bsd_socket = socket;
-
-       /* determine family */
+    /* determine family */
 #ifdef SO_DOMAIN
-       if (getsockopt(socket, SOL_SOCKET, SO_DOMAIN, &type, &type_len) == 0) {
+    if (getsockopt(socket, SOL_SOCKET, SO_DOMAIN, &type, &type_len) == 0) {
                retsock->type = type;
        } else
 #endif
@@ -2471,16 +2455,49 @@ PHP_FUNCTION(socket_import_stream)
                goto error;
        }
 
-       /* determine blocking mode */
+    /* determine blocking mode */
 #ifndef PHP_WIN32
-       t = fcntl(socket, F_GETFL);
-       if(t == -1) {
+    t = fcntl(socket, F_GETFL);
+    if (t == -1) {
                PHP_SOCKET_ERROR(retsock, "unable to obtain blocking state", errno);
                goto error;
-       } else {
-               retsock->blocking = !(t & O_NONBLOCK);
+    } else {
+       retsock->blocking = !(t & O_NONBLOCK);
+    }
+#endif
+
+    return retsock;
+
+error:
+       efree(retsock);
+       return NULL;
+}
+
+/* {{{ proto void socket_import_stream(resource stream)
+   Imports a stream that encapsulates a socket into a socket extension resource. */
+PHP_FUNCTION(socket_import_stream)
+{
+       zval                             *zstream;
+       php_stream                       *stream;
+       php_socket                       *retsock = NULL;
+       PHP_SOCKET                       socket; /* fd */
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) {
+               return;
        }
-#else
+       php_stream_from_zval(stream, &zstream);
+
+       if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void**)&socket, 1)) {
+               /* error supposedly already shown */
+               RETURN_FALSE;
+       }
+
+       retsock = socket_import_file_descriptor(socket);
+       if (retsock == NULL) {
+               RETURN_FALSE;
+       }
+
+#ifdef PHP_WIN32
        /* on windows, check if the stream is a socket stream and read its
         * private data; otherwise assume it's in non-blocking mode */
        if (php_stream_is(stream, PHP_STREAM_IS_SOCKET)) {
@@ -2504,11 +2521,6 @@ PHP_FUNCTION(socket_import_stream)
                PHP_STREAM_BUFFER_NONE, NULL);
 
        ZEND_REGISTER_RESOURCE(return_value, retsock, le_socket);
-       return;
-error:
-       if (retsock != NULL)
-               efree(retsock);
-       RETURN_FALSE;
 }
 /* }}} */