From c85eca8ea93b9ab13cd98f475110411744d743b6 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 12 Feb 2025 10:08:51 -0400
Subject: [PATCH] MT#55283 convert addr_print etc to bool

Change-Id: I2d5b48ea69452ebdc84e65ae309d7df6c314f865
---
 lib/socket.c | 24 ++++++++++++------------
 lib/socket.h | 16 ++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/socket.c b/lib/socket.c
index 9d44ddfd1..4a339a8a2 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,9 +14,9 @@
 
 static int __ip4_addr_parse(sockaddr_t *dst, const char *src);
 static int __ip6_addr_parse(sockaddr_t *dst, const char *src);
-static int __ip4_addr_print(const sockaddr_t *a, char *buf, size_t len);
-static int __ip6_addr_print(const sockaddr_t *a, char *buf, size_t len);
-static int __ip6_addr_print_p(const sockaddr_t *a, char *buf, size_t len);
+static bool __ip4_addr_print(const sockaddr_t *a, char *buf, size_t len);
+static bool __ip6_addr_print(const sockaddr_t *a, char *buf, size_t len);
+static bool __ip6_addr_print_p(const sockaddr_t *a, char *buf, size_t len);
 static unsigned int __ip4_hash(const sockaddr_t *a);
 static unsigned int __ip6_hash(const sockaddr_t *a);
 static int __ip4_eq(const sockaddr_t *a, const sockaddr_t *b);
@@ -171,25 +171,25 @@ static int __ip6_addr_parse(sockaddr_t *dst, const char *src) {
 		return 0;
 	return -1;
 }
-static int __ip4_addr_print(const sockaddr_t *a, char *buf, size_t len) {
+static bool __ip4_addr_print(const sockaddr_t *a, char *buf, size_t len) {
 	buf[0] = '\0';
 	if (!inet_ntop(AF_INET, &a->ipv4, buf, len))
-		return -1;
-	return 0;
+		return false;
+	return true;
 }
-static int __ip6_addr_print(const sockaddr_t *a, char *buf, size_t len) {
+static bool __ip6_addr_print(const sockaddr_t *a, char *buf, size_t len) {
 	buf[0] = '\0';
 	if (!inet_ntop(AF_INET6, &a->ipv6, buf, len))
-		return -1;
-	return 0;
+		return false;
+	return true;
 }
-static int __ip6_addr_print_p(const sockaddr_t *a, char *buf, size_t len) {
+static bool __ip6_addr_print_p(const sockaddr_t *a, char *buf, size_t len) {
 	buf[0] = '\0';
 	if (!inet_ntop(AF_INET6, &a->ipv6, buf+1, len-2))
-		return -1;
+		return false;
 	buf[0] = '[';
 	strcpy(buf + strlen(buf), "]");
-	return 0;
+	return true;
 }
 static unsigned int __ip4_hash(const sockaddr_t *a) {
 	return a->ipv4.s_addr;
diff --git a/lib/socket.h b/lib/socket.h
index f8632762c..38bd35974 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -63,8 +63,8 @@ struct socket_family {
 	unsigned int			(*hash)(const sockaddr_t *);
 	int				(*eq)(const sockaddr_t *, const sockaddr_t *);
 	int				(*addr_parse)(sockaddr_t *, const char *);
-	int				(*addr_print)(const sockaddr_t *, char *, size_t);
-	int				(*addr_print_p)(const sockaddr_t *, char *, size_t);
+	bool				(*addr_print)(const sockaddr_t *, char *, size_t);
+	bool				(*addr_print_p)(const sockaddr_t *, char *, size_t);
 	int				(*is_specified)(const sockaddr_t *);
 	int				(*sockaddr2endpoint)(endpoint_t *, const void *);
 	int				(*endpoint2sockaddr)(void *, const endpoint_t *);
@@ -117,10 +117,10 @@ extern socktype_t *socktype_udp;
 #include "auxlib.h"
 
 
-INLINE int sockaddr_print(const sockaddr_t *a, char *buf, size_t len) {
+INLINE bool sockaddr_print(const sockaddr_t *a, char *buf, size_t len) {
 	if (!a->family) {
 		buf[0] = '\0';
-		return 0;
+		return true;
 	}
 	return a->family->addr_print(a, buf, len);
 }
@@ -137,15 +137,15 @@ INLINE int sockaddr_print_gstring(GString *s, const sockaddr_t *a) {
 	if (!a->family)
 		return 0;
 	char buf[THREAD_BUF_SIZE];
-	if (sockaddr_print(a, buf, THREAD_BUF_SIZE))
+	if (!sockaddr_print(a, buf, THREAD_BUF_SIZE))
 		return -1;
 	g_string_append(s, buf);
 	return 0;
 }
-INLINE int sockaddr_print_p(const sockaddr_t *a, char *buf, size_t len) {
+INLINE bool sockaddr_print_p(const sockaddr_t *a, char *buf, size_t len) {
 	if (!a->family) {
 		buf[0] = '\0';
-		return 0;
+		return true;
 	}
 	return a->family->addr_print_p(a, buf, len);
 }
@@ -159,7 +159,7 @@ INLINE int sockaddr_print_port(const sockaddr_t *a, unsigned int port, char *buf
 		buf[0] = '\0';
 		return 0;
 	}
-	if (a->family->addr_print_p(a, buf, len-6))
+	if (!a->family->addr_print_p(a, buf, len-6))
 		return -1;
 	sprintf(buf + strlen(buf), ":%u", port);
 	return 0;