From 272dfc1f024f3481d5c94942a84afe592d91394c Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 21 Oct 2019 11:11:27 +0200 Subject: socket: Remove unneeded condition check in osmo_sock_init2_multiaddr() Since we return error at the start of the function if proto != IPPROTO_SCTP, it makes no sense to check for proto != IPPROTO_UDP later on. Fixes: CID#205088 Change-Id: Ibba7eacaa9debb77d536d47dc85170c5ee79e479 --- src/socket.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/socket.c b/src/socket.c index 542c76e5..47528810 100644 --- a/src/socket.c +++ b/src/socket.c @@ -467,21 +467,21 @@ int osmo_sock_init2_multiaddr(uint16_t family, uint16_t type, uint8_t proto, return sfd; } - if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) { - rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, - &on, sizeof(on)); - if (rc < 0) { - multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt); - LOGP(DLGLOBAL, LOGL_ERROR, - "cannot setsockopt socket:" - " %s:%u: %s\n", - strbuf, local_port, - strerror(errno)); - for (i = 0; i < local_hosts_cnt; i++) - freeaddrinfo(result[i]); - close(sfd); - return rc; - } + /* Since so far we only allow IPPROTO_SCTP in this function, + no need to check below for "proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR" */ + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, + &on, sizeof(on)); + if (rc < 0) { + multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt); + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket:" + " %s:%u: %s\n", + strbuf, local_port, + strerror(errno)); + for (i = 0; i < local_hosts_cnt; i++) + freeaddrinfo(result[i]); + close(sfd); + return rc; } /* Build array of addresses taking first of same family for each host. -- cgit v1.2.3