]> granicus.if.org Git - php/commitdiff
Fix byteorder for il2long and long2ip (#6159)
authorStanislav Malyshev <stas@php.net>
Tue, 15 Aug 2000 10:32:55 +0000 (10:32 +0000)
committerStanislav Malyshev <stas@php.net>
Tue, 15 Aug 2000 10:32:55 +0000 (10:32 +0000)
@- Fix byte order for ip2long and long2ip (Stas)

ext/standard/basic_functions.c

index f2a9697d2220086fa5cc0a6da633bfa604a9dfae..84be4cae4abb0e023dc74e362d76462083bc2c23 100644 (file)
@@ -802,7 +802,7 @@ PHP_FUNCTION(ip2long)
 
        convert_to_string_ex(str);
 
-       RETURN_LONG(inet_addr((*str)->value.str.val));
+       RETURN_LONG(ntohl(inet_addr((*str)->value.str.val)));
 }
 /* }}} */
 
@@ -818,7 +818,7 @@ PHP_FUNCTION(long2ip)
        }
        
        convert_to_long_ex(num);
-       myaddr.s_addr = (unsigned long)(*num)->value.lval;
+       myaddr.s_addr = htonl((unsigned long)(*num)->value.lval);
 
        RETURN_STRING (inet_ntoa(myaddr), 1);
 }