Author: hrs
Date: Sun Sep 13 03:09:21 2015
New Revision: 287735
URL: https://svnweb.freebsd.org/changeset/base/287735
Log:
MFC 259169, 259176, 287097:
- Ansify function definitions.
- Change the type of addr argument in dump() function to be able
disambiguate link-local addresses from different zones.
- Add static and remove unused variables.
Modified:
stable/10/usr.sbin/ndp/ndp.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/ndp/ndp.c
==============================================================================
--- stable/10/usr.sbin/ndp/ndp.c Sun Sep 13 02:09:06 2015
(r287734)
+++ stable/10/usr.sbin/ndp/ndp.c Sun Sep 13 03:09:21 2015
(r287735)
@@ -127,28 +127,26 @@ static int32_t thiszone; /* time differe
static int s = -1;
static int repeat = 0;
-char ntop_buf[INET6_ADDRSTRLEN]; /* inet_ntop() */
-char host_buf[NI_MAXHOST]; /* getnameinfo() */
-char ifix_buf[IFNAMSIZ]; /* if_indextoname() */
+static char host_buf[NI_MAXHOST]; /* getnameinfo() */
+static char ifix_buf[IFNAMSIZ]; /* if_indextoname() */
-int main(int, char **);
static int file(char *);
-void getsocket(void);
-int set(int, char **);
-void get(char *);
-int delete(char *);
-void dump(struct in6_addr *, int);
+static void getsocket(void);
+static int set(int, char **);
+static void get(char *);
+static int delete(char *);
+static void dump(struct sockaddr_in6 *, int);
static struct in6_nbrinfo *getnbrinfo(struct in6_addr *, int, int);
static char *ether_str(struct sockaddr_dl *);
-int ndp_ether_aton(char *, u_char *);
-void usage(void);
-int rtmsg(int);
-void ifinfo(char *, int, char **);
-void rtrlist(void);
-void plist(void);
-void pfx_flush(void);
-void rtr_flush(void);
-void harmonize_rtr(void);
+static int ndp_ether_aton(char *, u_char *);
+static void usage(void);
+static int rtmsg(int);
+static void ifinfo(char *, int, char **);
+static void rtrlist(void);
+static void plist(void);
+static void pfx_flush(void);
+static void rtr_flush(void);
+static void harmonize_rtr(void);
#ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */
static void getdefif(void);
static void setdefif(char *);
@@ -163,15 +161,11 @@ static char *rtpref_str[] = {
"low" /* 11 */
};
-int mode = 0;
-char *arg = NULL;
-
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char **argv)
{
- int ch;
+ int ch, mode = 0;
+ char *arg = NULL;
pid = getpid();
thiszone = gmt2local(0);
@@ -320,8 +314,7 @@ main(argc, argv)
* Process a file to set standard ndp entries
*/
static int
-file(name)
- char *name;
+file(char *name)
{
FILE *fp;
int i, retval;
@@ -355,7 +348,7 @@ file(name)
return (retval);
}
-void
+static void
getsocket()
{
if (s < 0) {
@@ -367,23 +360,32 @@ getsocket()
}
}
-struct sockaddr_in6 so_mask = {sizeof(so_mask), AF_INET6 };
-struct sockaddr_in6 blank_sin = {sizeof(blank_sin), AF_INET6 }, sin_m;
-struct sockaddr_dl blank_sdl = {sizeof(blank_sdl), AF_LINK }, sdl_m;
-time_t expire_time;
-int flags, found_entry;
-struct {
+static struct sockaddr_in6 so_mask = {
+ .sin6_len = sizeof(so_mask),
+ .sin6_family = AF_INET6
+};
+static struct sockaddr_in6 blank_sin = {
+ .sin6_len = sizeof(blank_sin),
+ .sin6_family = AF_INET6
+};
+static struct sockaddr_in6 sin_m;
+static struct sockaddr_dl blank_sdl = {
+ .sdl_len = sizeof(blank_sdl),
+ .sdl_family = AF_LINK
+};
+static struct sockaddr_dl sdl_m;
+static time_t expire_time;
+static int flags, found_entry;
+static struct {
struct rt_msghdr m_rtm;
char m_space[512];
-} m_rtmsg;
+} m_rtmsg;
/*
* Set an individual neighbor cache entry
*/
-int
-set(argc, argv)
- int argc;
- char **argv;
+static int
+set(int argc, char **argv)
{
register struct sockaddr_in6 *sin = &sin_m;
register struct sockaddr_dl *sdl;
@@ -457,9 +459,8 @@ overwrite:
/*
* Display an individual neighbor cache entry
*/
-void
-get(host)
- char *host;
+static void
+get(char *host)
{
struct sockaddr_in6 *sin = &sin_m;
struct addrinfo hints, *res;
@@ -475,7 +476,9 @@ get(host)
return;
}
sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
- dump(&sin->sin6_addr, 0);
+ sin->sin6_scope_id =
+ ((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id;
+ dump(sin, 0);
if (found_entry == 0) {
getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
sizeof(host_buf), NULL ,0,
@@ -488,9 +491,8 @@ get(host)
/*
* Delete a neighbor cache entry
*/
-int
-delete(host)
- char *host;
+static int
+delete(char *host)
{
struct sockaddr_in6 *sin = &sin_m;
register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
@@ -557,10 +559,8 @@ delete:
/*
* Dump the entire neighbor cache
*/
-void
-dump(addr, cflag)
- struct in6_addr *addr;
- int cflag;
+static void
+dump(struct sockaddr_in6 *addr, int cflag)
{
int mib[6];
size_t needed;
@@ -632,7 +632,9 @@ again:;
continue;
if (addr) {
- if (!IN6_ARE_ADDR_EQUAL(addr, &sin->sin6_addr))
+ if (IN6_ARE_ADDR_EQUAL(&addr->sin6_addr,
+ &sin->sin6_addr) == 0 ||
+ addr->sin6_scope_id != sin->sin6_scope_id)
continue;
found_entry = 1;
} else if (IN6_IS_ADDR_MULTICAST(&sin->sin6_addr))
@@ -765,10 +767,7 @@ again:;
}
static struct in6_nbrinfo *
-getnbrinfo(addr, ifindex, warning)
- struct in6_addr *addr;
- int ifindex;
- int warning;
+getnbrinfo(struct in6_addr *addr, int ifindex, int warning)
{
static struct in6_nbrinfo nbi;
int s;
@@ -794,7 +793,6 @@ static char *
ether_str(struct sockaddr_dl *sdl)
{
static char hbuf[NI_MAXHOST];
- char *cp;
if (sdl->sdl_alen == ETHER_ADDR_LEN) {
strlcpy(hbuf, ether_ntoa((struct ether_addr *)LLADDR(sdl)),
@@ -808,10 +806,8 @@ ether_str(struct sockaddr_dl *sdl)
return(hbuf);
}
-int
-ndp_ether_aton(a, n)
- char *a;
- u_char *n;
+static int
+ndp_ether_aton(char *a, u_char *n)
{
int i, o[6];
@@ -826,7 +822,7 @@ ndp_ether_aton(a, n)
return (0);
}
-void
+static void
usage()
{
printf("usage: ndp [-nt] hostname\n");
@@ -842,9 +838,8 @@ usage()
exit(1);
}
-int
-rtmsg(cmd)
- int cmd;
+static int
+rtmsg(int cmd)
{
static int seq;
int rlen;
@@ -908,11 +903,8 @@ doit:
return (0);
}
-void
-ifinfo(ifname, argc, argv)
- char *ifname;
- int argc;
- char **argv;
+static void
+ifinfo(char *ifname, int argc, char **argv)
{
struct in6_ndireq nd;
int i, s;
@@ -1071,7 +1063,7 @@ ifinfo(ifname, argc, argv)
#define ND_RA_FLAG_RTPREF_MASK 0x18 /* 00011000 */
#endif
-void
+static void
rtrlist()
{
int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_DRLIST };
@@ -1123,7 +1115,7 @@ rtrlist()
free(buf);
}
-void
+static void
plist()
{
int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_PRLIST };
@@ -1237,7 +1229,7 @@ plist()
free(buf);
}
-void
+static void
pfx_flush()
{
char dummyif[IFNAMSIZ+8];
@@ -1250,7 +1242,7 @@ pfx_flush()
err(1, "ioctl(SIOCSPFXFLUSH_IN6)");
}
-void
+static void
rtr_flush()
{
char dummyif[IFNAMSIZ+8];
@@ -1265,7 +1257,7 @@ rtr_flush()
close(s);
}
-void
+static void
harmonize_rtr()
{
char dummyif[IFNAMSIZ+8];
@@ -1282,8 +1274,7 @@ harmonize_rtr()
#ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */
static void
-setdefif(ifname)
- char *ifname;
+setdefif(char *ifname)
{
struct in6_ndifreq ndifreq;
unsigned int ifindex;
@@ -1336,8 +1327,7 @@ getdefif()
#endif
static char *
-sec2str(total)
- time_t total;
+sec2str(time_t total)
{
static char result[256];
int days, hours, mins, secs;
@@ -1382,8 +1372,7 @@ sec2str(total)
* from tcpdump/util.c
*/
static void
-ts_print(tvp)
- const struct timeval *tvp;
+ts_print(const struct timeval *tvp)
{
int s;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
