From 386f1d50cd7155f7ef2609f3e53084efb2ccd5e9 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 12 Feb 2025 10:23:06 -0400
Subject: [PATCH] MT#55283 convert open_v46_socket to bool

Change-Id: I174a08cbed3f6ac856bf29458ee3c81ca2947de9
---
 daemon/dtmf.c | 2 +-
 lib/socket.c  | 6 +++---
 lib/socket.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/daemon/dtmf.c b/daemon/dtmf.c
index 1b1b06a2a..d1bc71dde 100644
--- a/daemon/dtmf.c
+++ b/daemon/dtmf.c
@@ -77,7 +77,7 @@ const char *dtmf_trigger_types[__NUM_DTMF_TRIGGERS] = {
 bool dtmf_init(void) {
 	ilog(LOG_DEBUG, "log dtmf over ng %d", rtpe_config.dtmf_via_ng);
 	ilog(LOG_DEBUG, "no log injected dtmf %d", rtpe_config.dtmf_no_log_injects);
-	if (open_v46_socket(&dtmf_log_sock, SOCK_DGRAM)) {
+	if (!open_v46_socket(&dtmf_log_sock, SOCK_DGRAM)) {
 		ilog(LOG_ERR, "Failed to open/connect DTMF logging socket: %s", strerror(errno));
 		return false;
 	}
diff --git a/lib/socket.c b/lib/socket.c
index 5bab5d723..04fd56bd1 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -772,14 +772,14 @@ fail:
 	return false;
 }
 
-int open_v46_socket(socket_t *r, int type) {
+bool open_v46_socket(socket_t *r, int type) {
 	int ret = __socket(r, type, &__socket_families[SF_IP6]);
 	if (ret) {
 		if (errno == EAFNOSUPPORT)
 			ret = __socket(r, type, &__socket_families[SF_IP4]);
 		if (ret) {
 			__C_DBG("open socket fail");
-			return -1;
+			return false;
 		}
 	}
 	else
@@ -787,7 +787,7 @@ int open_v46_socket(socket_t *r, int type) {
 
 	nonblock(r->fd);
 
-	return 0;
+	return true;
 }
 
 void dummy_socket(socket_t *r, const sockaddr_t *sa) {
diff --git a/lib/socket.h b/lib/socket.h
index 28d51f8fd..b0d7f0758 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -275,7 +275,7 @@ INLINE int socket_cpu_affinity(socket_t *s, int cpu) {
 void socket_init(void);
 
 bool open_socket(socket_t *r, int type, unsigned int port, const sockaddr_t *);
-int open_v46_socket(socket_t *r, int type);
+bool 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
 int connect_socket_retry(socket_t *r); // retries connect() while in progress