makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9746] Adding wrapper functions for inet_ntop() and inet_pton().

Browse source 
PHPBB3-9746
This commit is contained in:
Andreas Fischer 2010-07-23 10:35:55 +02:00
parent fdb5c2c990
commit ae43221399
1 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
phpBB/includes/functions.php
View file

@ -3312,7 +3312,7 @@ function phpbb_ip_normalise($address)
} }
else if (preg_match(get_preg_expression('ipv6'), $address)) else if (preg_match(get_preg_expression('ipv6'), $address))
{ {
$address = inet_ntop(inet_pton($address)); $address = phpbb_inet_ntop(phpbb_inet_pton($address));
if (strpos($address, '::ffff:') === 0) if (strpos($address, '::ffff:') === 0)
{ {
@ -3333,6 +3333,37 @@ function phpbb_ip_normalise($address)
return false; return false;
} }
/**
* Wrapper for inet_ntop()
*
* Converts a packed internet address to a human readable representation
* inet_ntop() is supported by PHP since 5.1.0, since 5.3.0 also on Windows.
*
* @param string $in_addr A 32bit IPv4, or 128bit IPv6 address.
*
* @return mixed false on failure,
* string otherwise
*/
function phpbb_inet_ntop($in_addr)
{
return inet_ntop($in_addr);
}
/**
* Wrapper for inet_pton()
*
* Converts a human readable IP address to its packed in_addr representation
* inet_pton() is supported by PHP since 5.1.0, since 5.3.0 also on Windows.
*
* @param string $address A human readable IPv4 or IPv6 address.
*
* @return string in_addr representation of the given address
*/
function phpbb_inet_pton($address)
{
return inet_pton($address);
}
/** /**
* Wrapper for php's checkdnsrr function. * Wrapper for php's checkdnsrr function.
* *