From 74ff6382f5743e09930e6cbd195dac65cd6062c9 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Fri, 18 Oct 2024 04:30:09 +0000
Subject: [PATCH] upstream: remove addr.[ch] functions that are unused and

visbility-restrict ones that are unused outside the implementation itself;
based on GHPR#282 by tobias@

OpenBSD-Commit-ID: a0140f2418b4d46cfaa7b33febc0a0931f9b2744
---
 addr.c | 22 ++++++++++++----------
 addr.h | 11 -----------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/addr.c b/addr.c
index 0e7cb1df3..e207287c1 100644
--- a/addr.c
+++ b/addr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: addr.c,v 1.8 2024/04/02 09:29:31 deraadt Exp $ */
+/* $OpenBSD: addr.c,v 1.9 2024/10/18 04:30:09 djm Exp $ */
 
 /*
  * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -33,7 +33,7 @@
 
 #define _SA(x)	((struct sockaddr *)(x))
 
-int
+static int
 addr_unicast_masklen(int af)
 {
 	switch (af) {
@@ -59,7 +59,7 @@ masklen_valid(int af, u_int masklen)
 	}
 }
 
-int
+static int
 addr_xaddr_to_sa(const struct xaddr *xa, struct sockaddr *sa, socklen_t *len,
     u_int16_t port)
 {
@@ -138,7 +138,7 @@ addr_sa_to_xaddr(struct sockaddr *sa, socklen_t slen, struct xaddr *xa)
 	return 0;
 }
 
-int
+static int
 addr_invert(struct xaddr *n)
 {
 	int i;
@@ -193,7 +193,7 @@ addr_netmask(int af, u_int l, struct xaddr *n)
 	}
 }
 
-int
+static int
 addr_hostmask(int af, u_int l, struct xaddr *n)
 {
 	if (addr_netmask(af, l, n) == -1 || addr_invert(n) == -1)
@@ -228,7 +228,7 @@ addr_and(struct xaddr *dst, const struct xaddr *a, const struct xaddr *b)
 	}
 }
 
-int
+static int
 addr_or(struct xaddr *dst, const struct xaddr *a, const struct xaddr *b)
 {
 	int i;
@@ -283,7 +283,7 @@ addr_cmp(const struct xaddr *a, const struct xaddr *b)
 	}
 }
 
-int
+static int
 addr_is_all0s(const struct xaddr *a)
 {
 	int i;
@@ -330,7 +330,7 @@ addr_increment(struct xaddr *a)
  * Returns 0 if host portion of address is all-zeros,
  * -1 if not all zeros or on failure.
  */
-int
+static int
 addr_host_is_all0s(const struct xaddr *a, u_int masklen)
 {
 	struct xaddr tmp_addr, tmp_mask, tmp_result;
@@ -344,7 +344,7 @@ addr_host_is_all0s(const struct xaddr *a, u_int masklen)
 }
 
 #if 0
-int
+static int
 addr_host_to_all0s(struct xaddr *a, u_int masklen)
 {
 	struct xaddr tmp_mask;
@@ -402,7 +402,8 @@ addr_pton(const char *p, struct xaddr *n)
 	return 0;
 }
 
-int
+#if 0
+static int
 addr_sa_pton(const char *h, const char *s, struct sockaddr *sa, socklen_t slen)
 {
 	struct addrinfo hints, *ai;
@@ -432,6 +433,7 @@ addr_sa_pton(const char *h, const char *s, struct sockaddr *sa, socklen_t slen)
 	freeaddrinfo(ai);
 	return 0;
 }
+#endif
 
 int
 addr_ntop(const struct xaddr *n, char *p, size_t len)
diff --git a/addr.h b/addr.h
index 180e9fdc6..29438dfec 100644
--- a/addr.h
+++ b/addr.h
@@ -39,24 +39,13 @@ struct xaddr {
 #define addr32	xa.addr32
 };
 
-int addr_unicast_masklen(int af);
-int addr_xaddr_to_sa(const struct xaddr *xa, struct sockaddr *sa,
-    socklen_t *len, u_int16_t port);
 int addr_sa_to_xaddr(struct sockaddr *sa, socklen_t slen, struct xaddr *xa);
 int addr_netmask(int af, u_int l, struct xaddr *n);
-int addr_hostmask(int af, u_int l, struct xaddr *n);
-int addr_invert(struct xaddr *n);
 int addr_pton(const char *p, struct xaddr *n);
-int addr_sa_pton(const char *h, const char *s, struct sockaddr *sa,
-    socklen_t slen);
 int addr_pton_cidr(const char *p, struct xaddr *n, u_int *l);
 int addr_ntop(const struct xaddr *n, char *p, size_t len);
 int addr_and(struct xaddr *dst, const struct xaddr *a, const struct xaddr *b);
-int addr_or(struct xaddr *dst, const struct xaddr *a, const struct xaddr *b);
 int addr_cmp(const struct xaddr *a, const struct xaddr *b);
-int addr_is_all0s(const struct xaddr *n);
-int addr_host_is_all0s(const struct xaddr *n, u_int masklen);
-int addr_host_to_all0s(struct xaddr *a, u_int masklen);
 int addr_host_to_all1s(struct xaddr *a, u_int masklen);
 int addr_netmatch(const struct xaddr *host, const struct xaddr *net,
     u_int masklen);