archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Further fix for bug #55111 (compilation failure of ext/sockets in Mac OS X).

Browse source
This commit is contained in:
Gustavo André dos Santos Lopes 2011-07-11 08:29:39 +00:00
parent fb6440b4f1
commit 1ca51e87ea
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/sockets/multicast.c
View file

@ -423,8 +423,8 @@ int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_add
#define ifr_ifindex ifr_index
#endif
if_req.ifr_ifindex = if_index;
#if defined(SIOCGIFNAME)
if_req.ifr_ifindex = if_index;
if (ioctl(php_sock->bsd_socket, SIOCGIFNAME, &if_req) == -1) {
#elif defined(HAVE_IF_INDEXTONAME)
if (if_indextoname(if_index, if_req.ifr_name) == NULL) {
@ -503,14 +503,25 @@ int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *i
if ((((struct sockaddr*)&cur_req->ifr_addr)->sa_family == AF_INET) &&
(((struct sockaddr_in*)&cur_req->ifr_addr)->sin_addr.s_addr ==
addr->s_addr)) {
#if defined(SIOCGIFINDEX)
if (ioctl(php_sock->bsd_socket, SIOCGIFINDEX, (char*)cur_req)
== -1) {
#elif defined(HAVE_IF_NAMETOINDEX)
unsigned index_tmp;
if ((index_tmp = if_nametoindex(cur_req->ifr_name)) == 0) {
#else
#error Neither SIOCGIFINDEX nor if_nametoindex are available
#endif
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Error converting interface name to index: error %d",
errno);
goto err;
} else {
#if defined(SIOCGIFINDEX)
*if_index = cur_req->ifr_ifindex;
#else
*if_index = index_tmp;
#endif
efree(buf);
return SUCCESS;
}