From c2ba54e615e5a51b7ea0c65790761c69b3f40784 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 12 Feb 2025 10:22:16 -0400
Subject: [PATCH] MT#55283 convert open_socket to bool

Change-Id: I715afc937f6b1cbc124ff14a0428f781f58cd050
---
 daemon/media_socket.c  | 2 +-
 daemon/tcp_listener.c  | 2 +-
 daemon/udp_listener.c  | 2 +-
 include/media_socket.h | 4 ----
 lib/socket.c           | 8 ++++----
 lib/socket.h           | 2 +-
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/daemon/media_socket.c b/daemon/media_socket.c
index 75032aa3d..17d8b733d 100644
--- a/daemon/media_socket.c
+++ b/daemon/media_socket.c
@@ -1047,7 +1047,7 @@ struct local_intf *get_any_interface_address(const struct logical_intf *lif, soc
 static bool add_socket(socket_t *r, unsigned int port, struct intf_spec *spec, const str *label) {
 	__C_DBG("An attempt to open a socket for the port: '%u'", port);
 
-	if (open_socket(r, SOCK_DGRAM, port, &spec->local_address.addr)) {
+	if (!open_socket(r, SOCK_DGRAM, port, &spec->local_address.addr)) {
 		__C_DBG("Can't open a socket for the port: '%d'", port);
 		return false;
 	}
diff --git a/daemon/tcp_listener.c b/daemon/tcp_listener.c
index 9fade2daa..332304f61 100644
--- a/daemon/tcp_listener.c
+++ b/daemon/tcp_listener.c
@@ -78,7 +78,7 @@ static int tcp_listener_init(socket_t *sock, const endpoint_t *ep,
 	cb->p = obj_get_o(obj);
 	cb->ul = sock;
 
-	if (open_socket(sock, SOCK_STREAM, ep->port, &ep->address))
+	if (!open_socket(sock, SOCK_STREAM, ep->port, &ep->address))
 		goto fail;
 	if (sock->family->listen(sock, 5))
 		goto fail;
diff --git a/daemon/udp_listener.c b/daemon/udp_listener.c
index 8c0316b47..f466dfb9e 100644
--- a/daemon/udp_listener.c
+++ b/daemon/udp_listener.c
@@ -86,7 +86,7 @@ int udp_listener_init(socket_t *sock, const endpoint_t *ep,
 	cb->p = obj_get_o(obj);
 	cb->ul = sock;
 
-	if (open_socket(sock, SOCK_DGRAM, ep->port, &ep->address))
+	if (!open_socket(sock, SOCK_DGRAM, ep->port, &ep->address))
 		goto fail;
 
 	socket_pktinfo(sock);
diff --git a/include/media_socket.h b/include/media_socket.h
index 8b38a9f57..77db53ddc 100644
--- a/include/media_socket.h
+++ b/include/media_socket.h
@@ -305,10 +305,6 @@ void free_sfd_intf_list(struct sfd_intf_list *il);
 void free_release_sfd_intf_list(struct sfd_intf_list *il);
 void free_socket_intf_list(struct socket_intf_list *il);
 
-INLINE int open_intf_socket(socket_t *r, unsigned int port, const struct local_intf *lif) {
-	return open_socket(r, SOCK_DGRAM, port, &lif->spec->local_address.addr);
-}
-
 void kernelize(struct packet_stream *);
 void __unkernelize(struct packet_stream *, const char *);
 void unkernelize(struct packet_stream *, const char *);
diff --git a/lib/socket.c b/lib/socket.c
index 41250571c..5bab5d723 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -735,14 +735,14 @@ static int __socket(socket_t *r, int type, sockfamily_t *fam) {
 	return 0;
 }
 
-int open_socket(socket_t *r, int type, unsigned int port, const sockaddr_t *sa) {
+bool open_socket(socket_t *r, int type, unsigned int port, const sockaddr_t *sa) {
 	sockfamily_t *fam;
 
 	fam = sa->family;
 
 	if (__socket(r, type, fam)) {
 		__C_DBG("open socket fail, fd=%d", r->fd);
-		return -1;
+		return false;
 	}
 
 	nonblock(r->fd);
@@ -765,11 +765,11 @@ int open_socket(socket_t *r, int type, unsigned int port, const sockaddr_t *sa)
 
 	__C_DBG("open socket success, fd=%d, port=%d", r->fd, port);
 
-	return 0;
+	return true;
 
 fail:
 	close_socket(r);
-	return -1;
+	return false;
 }
 
 int open_v46_socket(socket_t *r, int type) {
diff --git a/lib/socket.h b/lib/socket.h
index aed52957e..28d51f8fd 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -274,7 +274,7 @@ INLINE int socket_cpu_affinity(socket_t *s, int cpu) {
 
 void socket_init(void);
 
-int open_socket(socket_t *r, int type, unsigned int port, const sockaddr_t *);
+bool open_socket(socket_t *r, int type, unsigned int port, const sockaddr_t *);
 int open_v46_socket(socket_t *r, int type);
 int connect_socket(socket_t *r, int type, const endpoint_t *ep);
 int connect_socket_nb(socket_t *r, int type, const endpoint_t *ep); // 1 == in progress