Convert sockaddr conv to use bool

Author: NattyNarwhal

ext/sockets/conversions.c

@@ -550,7 +550,7 @@ static void to_zval_read_uid_t(const char *data, zval *zv, res_context *ctx)
 /* CONVERSIONS for sockaddr */
 static void from_zval_write_sin_addr(const zval *zaddr_str, char *inaddr, ser_context *ctx)
 {
-	int					res;
+	bool res;
 	struct sockaddr_in	saddr = {0};
 	zend_string			*addr_str, *tmp_addr_str;
 
@@ -599,7 +599,7 @@ static void to_zval_read_sockaddr_in(const char *data, zval *zv, res_context *ct
 #ifdef HAVE_IPV6
 static void from_zval_write_sin6_addr(const zval *zaddr_str, char *addr6, ser_context *ctx)
 {
-	int					res;
+	bool res;
 	struct sockaddr_in6	saddr6 = {0};
 	zend_string			*addr_str, *tmp_addr_str;
 

ext/sockets/sockaddr_conv.c

@@ -11,7 +11,7 @@
 
 extern zend_result php_string_to_if_index(const char *val, unsigned *out);
 
-int php_set_common_addr(struct sockaddr *sin, int family, char *string, php_socket *php_sock) /* {{{ */
+bool php_set_common_addr(struct sockaddr *sin, int family, zend_string *string, php_socket *php_sock) /* {{{ */
 {
 #ifdef HAVE_GETADDRINFO
 	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)sin;
@@ -22,9 +22,9 @@ int php_set_common_addr(struct sockaddr *sin, int family, char *string, php_sock
 	struct addrinfo hints;
 	struct addrinfo *addrinfo = NULL;
 
-	if (family == AF_INET6 && inet_pton(AF_INET6, string, &tmp6)) {
+	if (family == AF_INET6 && inet_pton(AF_INET6, ZSTR_VAL(string), &tmp6)) {
 		memcpy(&(sin6->sin6_addr.s6_addr), &(tmp6.s6_addr), sizeof(struct in6_addr));
-	} else if (family == AF_INET && inet_pton(AF_INET, string, &tmp4)) {
+	} else if (family == AF_INET && inet_pton(AF_INET, ZSTR_VAL(string), &tmp4)) {
 		sin4->sin_addr.s_addr = tmp4.s_addr;
 	} else {
 		memset(&hints, 0, sizeof(struct addrinfo));
@@ -41,12 +41,12 @@ int php_set_common_addr(struct sockaddr *sin, int family, char *string, php_sock
 #else
 			PHP_SOCKET_ERROR(php_sock, "Host lookup failed", (-10000 - h_errno));
 #endif
-			return 0;
+			return false;
 		}
 		if (addrinfo->ai_family != family) {
 			php_error_docref(NULL, E_WARNING, "Host lookup failed: Wrong address family returned for socket");
 			freeaddrinfo(addrinfo);
-			return 0;
+			return false;
 		}
 
 		if (addrinfo->ai_family == AF_INET6) {
@@ -57,23 +57,23 @@ int php_set_common_addr(struct sockaddr *sin, int family, char *string, php_sock
 		freeaddrinfo(addrinfo);
 	}
 
-	return 1;
+	return true;
 #else
 	php_error_docref(NULL, E_WARNING, "Host lookup failed: getaddrinfo() not available on this system");
-	return 0;
+	return true;
 #endif
 }
 /* }}} */
 
 #ifdef HAVE_IPV6
 /* Sets addr by hostname, or by ip in string form (AF_INET6) */
-int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_sock) /* {{{ */
+bool php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_sock) /* {{{ */
 {
-	char *scope = strchr(string, '%');
+	char *scope = strchr(ZSTR_VAL(string), '%');
 
-	int ret = php_set_common_addr((struct sockaddr*)sin6, AF_INET6, string, php_sock);
+	bool ret = php_set_common_addr((struct sockaddr*)sin6, AF_INET6, string, php_sock);
 	if (!ret) {
-		return 0;
+		return false;
 	}
 
 	if (scope) {
@@ -100,23 +100,23 @@ int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_
 #endif
 
 /* Sets addr by hostname, or by ip in string form (AF_INET)  */
-int php_set_inet_addr(struct sockaddr_in *sin, zend_string *string, php_socket *php_sock) /* {{{ */
+bool php_set_inet_addr(struct sockaddr_in *sin, zend_string *string, php_socket *php_sock) /* {{{ */
 {
 	return php_set_common_addr((struct sockaddr*)sin, AF_INET, string, php_sock);
 }
 /* }}} */
 
 /* Sets addr by hostname or by ip in string form (AF_INET or AF_INET6,
  * depending on the socket) */
-int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, zend_string *string, php_socket *php_sock) /* {{{ */
+bool php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, zend_string *string, php_socket *php_sock) /* {{{ */
 {
 	if (php_sock->type == AF_INET) {
 		struct sockaddr_in t = {0};
 		if (php_set_inet_addr(&t, string, php_sock)) {
 			memcpy(ss, &t, sizeof t);
 			ss->ss_family = AF_INET;
 			*ss_len = sizeof(t);
-			return 1;
+			return true;
 		}
 	}
 #ifdef HAVE_IPV6
@@ -126,12 +126,12 @@ int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, zend_string
 			memcpy(ss, &t, sizeof t);
 			ss->ss_family = AF_INET6;
 			*ss_len = sizeof(t);
-			return 1;
+			return true;
 		}
 	}
 #endif
 	else {
 		zend_value_error("IP address used in the context of an unexpected type of socket");
 	}
-	return 0;
+	return false;
 }

ext/sockets/sockaddr_conv.h

@@ -16,16 +16,16 @@
  * The IPv6 literal can be a IPv4 mapped address (like ::ffff:127.0.0.1).
  * If the hostname yields no IPv6 addresses, a mapped IPv4 address may be returned (AI_V4MAPPED)
  */
-int php_set_inet6_addr(struct sockaddr_in6 *sin6, zend_string *string, php_socket *php_sock);
+bool php_set_inet6_addr(struct sockaddr_in6 *sin6, zend_string *string, php_socket *php_sock);
 
 /*
  * Convert an IPv4 literal or a hostname into a sockaddr_in.
  */
-int php_set_inet_addr(struct sockaddr_in *sin, zend_string *string, php_socket *php_sock);
+bool php_set_inet_addr(struct sockaddr_in *sin, zend_string *string, php_socket *php_sock);
 
 /*
  * Calls either php_set_inet6_addr() or php_set_inet_addr(), depending on the type of the socket.
  */
-int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, zend_string *string, php_socket *php_sock);
+bool php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, zend_string *string, php_socket *php_sock);
 
 #endif