From 218f2f4882482e1d023ddbf4b9f6cbf1f6b0145d Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 24 Jan 2007 22:02:01 +0000 Subject: accumulated post-1.4.0 fixes --- networking/libiproute/libnetlink.h | 5 +++-- networking/ping6.c | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'networking') diff --git a/networking/libiproute/libnetlink.h b/networking/libiproute/libnetlink.h index 6dd242d03..9a5a9d351 100644 --- a/networking/libiproute/libnetlink.h +++ b/networking/libiproute/libnetlink.h @@ -2,6 +2,9 @@ #ifndef __LIBNETLINK_H__ #define __LIBNETLINK_H__ 1 +#include +/* We need linux/types.h because older kernels use __u32 etc + * in linux/[rt]netlink.h. 2.6.19 seems to be ok, though */ #include #include @@ -37,6 +40,4 @@ extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, i extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len); - #endif /* __LIBNETLINK_H__ */ - diff --git a/networking/ping6.c b/networking/ping6.c index b95e098ad..c691fa74b 100644 --- a/networking/ping6.c +++ b/networking/ping6.c @@ -42,6 +42,8 @@ enum { PINGINTERVAL = 1 /* second */ }; +static const char *hostname; + static void ping(const char *host); #ifndef CONFIG_FEATURE_FANCY_PING6 @@ -50,7 +52,7 @@ static void ping(const char *host); static void noresp(int ign) { - printf("No response from %s\n", h->h_name); + printf("No response from %s\n", hostname); exit(EXIT_FAILURE); } @@ -63,6 +65,8 @@ static void ping(const char *host) int sockopt; char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; + hostname = host; + pingsock = create_icmp6_socket(); lsa = host_and_af2sockaddr(host, 0, AF_INET6); @@ -105,7 +109,7 @@ static void ping(const char *host) } if (ENABLE_FEATURE_CLEAN_UP) close(pingsock); - printf("%s is alive!\n", h->h_name); + printf("%s is alive!\n", hostname); } int ping6_main(int argc, char **argv) -- cgit v1.2.3