cvs: php4 /ext/sockets sockets.c

From: Date: Wed, 13 Sep 2000 23:33:40 +0000
Subject: cvs: php4 /ext/sockets sockets.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-1755@lists.php.net to get a copy of this message
chrisv Wed Sep 13 16:33:40 2000 EDT Modified files: /php4/ext/sockets sockets.c Log: Added prototypes for socketpair() and shutdown(), and corrected an obvious bug in socketpair (causing it to not return the created sockets to the PHP script.) Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.11 php4/ext/sockets/sockets.c:1.12 --- php4/ext/sockets/sockets.c:1.11 Mon Sep 11 09:19:53 2000 +++ php4/ext/sockets/sockets.c Wed Sep 13 16:33:39 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.11 2000/09/11 16:19:53 sas Exp $ */ +/* $Id: sockets.c,v 1.12 2000/09/13 23:33:39 chrisv Exp $ */ #include "php.h" @@ -1863,7 +1863,10 @@ RETURN_LONG(((ret < 0) ? -errno : ret)); } +/* }}} */ +/* {{{ proto int socketpair(int domain, int type, int protocol, array &fds) + Creates a pair of indistinguishable sockets and stores them in fds. */ PHP_FUNCTION(socketpair) { zval **domain, **type, **protocol, **fds, **fd; @@ -1874,6 +1877,7 @@ zend_get_parameters_ex(4, &domain, &type, &protocol, &fds) == FAILURE) { WRONG_PARAM_COUNT; } + v_convert_to_long_ex(3, domain, type, protocol); if (Z_LVAL_PP(domain) != AF_INET && Z_LVAL_PP(domain) != AF_UNIX) { @@ -1885,34 +1889,32 @@ php_error(E_WARNING, "Invalid socket type specified - assuming SOCK_STREAM"); Z_LVAL_PP(type) = SOCK_STREAM; } - - fd_ar = HASH_OF(*fds); - zend_hash_internal_pointer_reset(fd_ar); - - if (zend_hash_get_current_data(fd_ar, (void **)&fd) == FAILURE) { - php_error(E_WARNING, "Can't access data from fds array"); - RETURN_FALSE; - } - SEPARATE_ZVAL(fd); - - convert_to_long_ex(fd); - fds_ar[0] = Z_LVAL_PP(fd); - zend_hash_move_forward(fd_ar); - if (zend_hash_get_current_data(fd_ar, (void **)&fd) == FAILURE) { - php_error(E_WARNING, "Can't access data from fds array"); + /* Initialize the array */ + if (array_init(*fds) == FAILURE) { + php_error(E_WARNING, "Can't initialize fds array"); RETURN_FALSE; } - SEPARATE_ZVAL(fd); - - convert_to_long_ex(fd); - fds_ar[1] = Z_LVAL_PP(fd); + /* Get the sockets */ ret = socketpair(Z_LVAL_PP(domain), Z_LVAL_PP(type), Z_LVAL_PP(protocol), fds_ar); - RETURN_LONG(((ret < 0) ? -errno : ret)); + if (ret < 0) { + RETURN_LONG(-errno); + } + + /* Put them into the array */ + add_index_long(*fds, 0, fds_ar[0]); + add_index_long(*fds, 1, fds_ar[1]); + + /* ... and return */ + RETURN_LONG(ret); } +/* }}} */ +/* {{{ proto int shutdown(int fd, int how) + Shuts down a socket for receiving, sending, or both. */ + PHP_FUNCTION(shutdown) { zval **fd, **how; @@ -1933,7 +1935,6 @@ RETURN_LONG(((ret < 0) ? -errno : ret)); } - /* }}} */ #endif /* HAVE_SOCKETS */

« previous php.cvs (#1755) next »