1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00

- Add missing "static" keywords.

- Add a check for ifindex to if_indextoifinfo().  It returns NULL when
  if_indextoname() fails.

MFC after:	3 days
This commit is contained in:
Hiroki Sato 2013-07-09 07:08:36 +00:00
parent bba75509c1
commit 33631085f8
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=253058

View File

@ -95,7 +95,7 @@ struct sockaddr_in6 rcvfrom;
static const char *pidfilename = _PATH_RTADVDPID;
const char *conffile = _PATH_RTADVDCONF;
static struct pidfh *pfh;
int dflag = 0, sflag = 0;
static int dflag, sflag;
static int wait_shutdown;
#define PFD_RAWSOCK 0
@ -139,7 +139,7 @@ union nd_opt {
#define NDOPT_FLAG_RDNSS (1 << 5)
#define NDOPT_FLAG_DNSSL (1 << 6)
uint32_t ndopt_flags[] = {
static uint32_t ndopt_flags[] = {
[ND_OPT_SOURCE_LINKADDR] = NDOPT_FLAG_SRCLINKADDR,
[ND_OPT_TARGET_LINKADDR] = NDOPT_FLAG_TGTLINKADDR,
[ND_OPT_PREFIX_INFORMATION] = NDOPT_FLAG_PREFIXINFO,
@ -1637,6 +1637,11 @@ struct ifinfo *
if_indextoifinfo(int idx)
{
struct ifinfo *ifi;
char *name, name0[IFNAMSIZ];
/* Check if the interface has a valid name or not. */
if (if_indextoname(idx, name0) == NULL)
return (NULL);
TAILQ_FOREACH(ifi, &ifilist, ifi_next) {
if (ifi->ifi_ifindex == idx)