diff options
author | guenther <> | 2015-09-14 11:01:47 +0000 |
---|---|---|
committer | guenther <> | 2015-09-14 11:01:47 +0000 |
commit | df3c2449c4552e350ffe80cc4efdba189bc3ebbb (patch) | |
tree | c643dafac6e09d09dccc676f3963bd9b5b649eb0 | |
parent | 88c29e91bd71abb6920cd8e70ee2be3ca4e664a0 (diff) | |
download | openbsd-df3c2449c4552e350ffe80cc4efdba189bc3ebbb.tar.gz openbsd-df3c2449c4552e350ffe80cc4efdba189bc3ebbb.tar.bz2 openbsd-df3c2449c4552e350ffe80cc4efdba189bc3ebbb.zip |
Wrap <ifaddrs.h>, <netinet/in.h>, and <netinet/if_ether.h> so internal
calls go direct and all the symbols are weak
-rw-r--r-- | src/lib/libc/net/ethers.c | 3 | ||||
-rw-r--r-- | src/lib/libc/net/getifaddrs.c | 4 | ||||
-rw-r--r-- | src/lib/libc/net/rthdr.c | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/libc/net/ethers.c b/src/lib/libc/net/ethers.c index a89f0c217b..a7e0796c72 100644 --- a/src/lib/libc/net/ethers.c +++ b/src/lib/libc/net/ethers.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ethers.c,v 1.23 2015/01/16 16:48:51 deraadt Exp $ */ | 1 | /* $OpenBSD: ethers.c,v 1.24 2015/09/14 11:01:47 guenther Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> | 4 | * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> |
@@ -232,3 +232,4 @@ bad: | |||
232 | errno = EINVAL; | 232 | errno = EINVAL; |
233 | return (-1); | 233 | return (-1); |
234 | } | 234 | } |
235 | DEF_WEAK(ether_line); | ||
diff --git a/src/lib/libc/net/getifaddrs.c b/src/lib/libc/net/getifaddrs.c index 51dbbab871..182829c9d5 100644 --- a/src/lib/libc/net/getifaddrs.c +++ b/src/lib/libc/net/getifaddrs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: getifaddrs.c,v 1.12 2015/01/16 16:48:51 deraadt Exp $ */ | 1 | /* $OpenBSD: getifaddrs.c,v 1.13 2015/09/14 11:01:47 guenther Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1995, 1999 | 4 | * Copyright (c) 1995, 1999 |
@@ -288,9 +288,11 @@ getifaddrs(struct ifaddrs **pif) | |||
288 | } | 288 | } |
289 | return (0); | 289 | return (0); |
290 | } | 290 | } |
291 | DEF_WEAK(getifaddrs); | ||
291 | 292 | ||
292 | void | 293 | void |
293 | freeifaddrs(struct ifaddrs *ifp) | 294 | freeifaddrs(struct ifaddrs *ifp) |
294 | { | 295 | { |
295 | free(ifp); | 296 | free(ifp); |
296 | } | 297 | } |
298 | DEF_WEAK(freeifaddrs); | ||
diff --git a/src/lib/libc/net/rthdr.c b/src/lib/libc/net/rthdr.c index 92a1f75a76..1a29e87de1 100644 --- a/src/lib/libc/net/rthdr.c +++ b/src/lib/libc/net/rthdr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rthdr.c,v 1.10 2015/01/16 16:48:51 deraadt Exp $ */ | 1 | /* $OpenBSD: rthdr.c,v 1.11 2015/09/14 11:01:47 guenther Exp $ */ |
2 | /* $KAME: rthdr.c,v 1.22 2006/02/09 08:18:58 keiichi Exp $ */ | 2 | /* $KAME: rthdr.c,v 1.22 2006/02/09 08:18:58 keiichi Exp $ */ |
3 | 3 | ||
4 | /* | 4 | /* |
@@ -53,6 +53,7 @@ inet6_rth_space(int type, int segments) | |||
53 | return (0); /* type not suppported */ | 53 | return (0); /* type not suppported */ |
54 | } | 54 | } |
55 | } | 55 | } |
56 | DEF_WEAK(inet6_rth_space); | ||
56 | 57 | ||
57 | void * | 58 | void * |
58 | inet6_rth_init(void *bp, socklen_t bp_len, int type, int segments) | 59 | inet6_rth_init(void *bp, socklen_t bp_len, int type, int segments) |