php-win-ext/php-memcached
1
0
Fork 0
mirror of https://github.com/php-win-ext/php-memcached.git synced 2026-03-24 00:52:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

use php_network_get_peer_name

Browse Source
This commit is contained in:
Michael Wallner
2021-01-19 16:32:52 +01:00
parent 8ed8092c7f
commit 46967cc67f
2 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
php_memcached_server.c
View File

@@ -597,41 +597,25 @@ void s_handle_memcached_event (evutil_socket_t fd, short what, void *arg)
if (!client->on_connect_invoked) {
if (MEMC_HAS_CB(MEMC_SERVER_ON_CONNECT)) {
zval zremoteip, zremoteport;
zval params[2];
zend_string *zremoteaddr_str;
zval zremoteaddr;
zval params[1];
protocol_binary_response_status retval;
struct sockaddr_storage ss;
socklen_t ss_len = sizeof(ss);
ZVAL_NULL(&zremoteip);
ZVAL_NULL(&zremoteport);
ZVAL_NULL(&zremoteaddr);
if (getpeername (fd, (struct sockaddr *) &ss, &ss_len) == 0) {
char addr_buf[0x100];
switch (ss.ss_family) {
case AF_INET6:
ZVAL_STRING(&zremoteip, inet_ntop(ss.ss_family, &((struct sockaddr_in6 *) &ss)->sin6_addr, addr_buf, sizeof(addr_buf)));
ZVAL_LONG(&zremoteport, ntohs(((struct sockaddr_in6 *) &ss)->sin6_port));
break;
case AF_INET:
ZVAL_STRING(&zremoteip, inet_ntop(ss.ss_family, &((struct sockaddr_in *) &ss)->sin_addr, addr_buf, sizeof(addr_buf)));
ZVAL_LONG(&zremoteport, ntohs(((struct sockaddr_in *) &ss)->sin_port));
break;
}
if (SUCCESS == php_network_get_peer_name (fd, &zremoteaddr_str, NULL, NULL)) {
ZVAL_STR(&zremoteaddr, zremoteaddr_str);
} else {
php_error_docref(NULL, E_WARNING, "getpeername failed: %s", strerror (errno));
}
ZVAL_COPY(&params[0], &zremoteip);
ZVAL_COPY(&params[1], &zremoteport);
ZVAL_COPY(&params[0], &zremoteaddr);
retval = s_invoke_php_callback (&MEMC_GET_CB(MEMC_SERVER_ON_CONNECT), params, 2);
retval = s_invoke_php_callback (&MEMC_GET_CB(MEMC_SERVER_ON_CONNECT), params, 1);
zval_ptr_dtor(&params[0]);
zval_ptr_dtor(&params[1]);
zval_ptr_dtor(&zremoteip);
zval_ptr_dtor(&zremoteport);
zval_ptr_dtor(&zremoteaddr);
if (retval != PROTOCOL_BINARY_RESPONSE_SUCCESS) {
memcached_protocol_client_destroy (client->protocol_client);

4
server-example/run-server.php
View File

@@ -3,8 +3,8 @@
$server = new MemcachedServer();
$server->on (Memcached::ON_CONNECT,
function ($remote_ip, $remote_port) {
echo "Incoming connection from {$remote_ip}:{$remote_port}" . PHP_EOL;
function ($remote_addr) {
echo "Incoming connection from {$remote_addr}" . PHP_EOL;
return Memcached::RESPONSE_SUCCESS;
});