From d0e289af1d226fbe3bb74f047c17bc5cb4026c6c Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Wed, 6 Jun 2018 19:32:30 +0100 Subject: [PATCH] noip.c (encode_..._inet_addr): Only call `port_from_sockaddr' once. Just a small cleanup; no functional change. --- noip.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/noip.c b/noip.c index 0fab12e..68f4e1e 100644 --- a/noip.c +++ b/noip.c @@ -677,6 +677,7 @@ static int encode_unused_inet_addr(struct sockaddr *sa, struct sockaddr_un wsun; int rc; char buf[ADDRBUFSZ]; + int port = port_from_sockaddr(sa); snprintf(sun->sun_path, sizeof(sun->sun_path), "%s/%s", sockdir, present_sockaddr(sa, 0, buf, sizeof(buf))); @@ -684,7 +685,7 @@ static int encode_unused_inet_addr(struct sockaddr *sa, else if (rc == STALE) unlink(sun->sun_path); wildcard_address(sa->sa_family, &waddr.sa); - port_to_sockaddr(&waddr.sa, port_from_sockaddr(sa)); + port_to_sockaddr(&waddr.sa, port); snprintf(wsun.sun_path, sizeof(wsun.sun_path), "%s/%s", sockdir, present_sockaddr(&waddr.sa, 0, buf, sizeof(buf))); if ((rc = unix_socket_status(&wsun, !desperatep)) == USED) return (-1); @@ -706,6 +707,7 @@ static int encode_inet_addr(struct sockaddr_un *sun, int i; int desperatep = 0; address addr; + int port = port_from_sockaddr(sa); char buf[ADDRBUFSZ]; int rc; @@ -713,14 +715,14 @@ static int encode_inet_addr(struct sockaddr_un *sun, present_sockaddr(sa, 0, buf, sizeof(buf)), want == WANT_EXISTING ? "EXISTING" : "FRESH"); ) sun->sun_family = AF_UNIX; - if (port_from_sockaddr(sa) || want == WANT_EXISTING) { + if (port || want == WANT_EXISTING) { snprintf(sun->sun_path, sizeof(sun->sun_path), "%s/%s", sockdir, present_sockaddr(sa, 0, buf, sizeof(buf))); rc = unix_socket_status(sun, 0); if (rc == STALE) unlink(sun->sun_path); if (rc != USED && want == WANT_EXISTING) { wildcard_address(sa->sa_family, &addr.sa); - port_to_sockaddr(&addr.sa, port_from_sockaddr(sa)); + port_to_sockaddr(&addr.sa, port); snprintf(sun->sun_path, sizeof(sun->sun_path), "%s/%s", sockdir, present_sockaddr(&addr.sa, 0, buf, sizeof(buf))); if (unix_socket_status(sun, 0) == STALE) unlink(sun->sun_path); -- 2.11.0