From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/include/inet_common.h | 25 +++++++++--------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'release/src/router/busybox/include/inet_common.h') diff --git a/release/src/router/busybox/include/inet_common.h b/release/src/router/busybox/include/inet_common.h index af1b3bf5..f4374e5a 100644 --- a/release/src/router/busybox/include/inet_common.h +++ b/release/src/router/busybox/include/inet_common.h @@ -1,33 +1,26 @@ +/* vi: set sw=4 ts=4: */ /* * stolen from net-tools-1.59 and stripped down for busybox by * Erik Andersen * * Heavily modified by Manuel Novoa III Mar 12, 2001 * - * Version: $Id: inet_common.h,v 1.1.3.1 2004/12/29 07:07:44 honor Exp $ - * */ -#include -#include -#include -#include - - -extern const char bb_INET_default[]; /* = "default" */ +#include "platform.h" /* hostfirst!=0 If we expect this to be a hostname, try hostname database first */ -extern int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst); +int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst) FAST_FUNC; - -/* numeric: & 0x8000: default instead of *, +/* numeric: & 0x8000: "default" instead of "*", * & 0x4000: host instead of net, * & 0x0fff: don't resolve */ -extern int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in, - int numeric, unsigned int netmask); -extern int INET6_resolve(char *name, struct sockaddr_in6 *sin6); -extern int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric); +int INET6_resolve(const char *name, struct sockaddr_in6 *sin6) FAST_FUNC; + +/* These return malloced string */ +char *INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask) FAST_FUNC; +char *INET6_rresolve(struct sockaddr_in6 *sin6, int numeric) FAST_FUNC; -- cgit v1.2.3-54-g00ecf