RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
djm@openbsd.org 2024-10-18 04:30:09 +00:00 committed by Damien Miller
parent a9d6d7d93c
commit 74ff6382f5
No known key found for this signature in database
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addr.c
View File

@ -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)

11
addr.h
View File

@ -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);