mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-25 07:49:18 +00:00
Code Issues Releases Activity

ndp: improve -c and -d handling in ndp_netlink

Browse Source 
This patch restores/fixes some of the behavior present in pre-netlink ndp(8).

 1. Deleting a local address now correctly returns EPERM (instead of
    ENOENT)
 2. ndp -c no longer dumps the entire table while complaining about
    local addresses
 3. Return exit code when deleting entry (e.g. trying ndp -d on a local
    address is an error)

Reviewed by:	kp
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D42316
This commit is contained in:
R. Christian McDonald 2023-10-23 21:43:44 +02:00 committed by Kristof Provost
parent dd7d42a1fa
commit 934a24e55a
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/ndp/ndp.c
View File

@ -201,6 +201,7 @@ main(int argc, char **argv)
{
int ch, mode = 0;
char *arg = NULL;
int ret = 0;
pid = getpid();
thiszone = utc_offset();
@ -280,7 +281,7 @@ main(int argc, char **argv)
/*NOTREACHED*/
}
xo_open_list("neighbor-cache");
delete(arg);
ret = delete(arg);
xo_close_list("neighbor-cache");
break;
case 'I':
@ -353,7 +354,8 @@ main(int argc, char **argv)
}
xo_close_container("ndp");
xo_finish();
exit(0);
return (ret);
}
/*
@ -841,7 +843,7 @@ static int
delete(char *host)
{
#ifndef WITHOUT_NETLINK
return (delete_nl(0, host));
return (delete_nl(0, host, true)); /* do warn */
#else
return (delete_rtsock(host));
#endif

2
usr.sbin/ndp/ndp.h
View File

@ -20,7 +20,7 @@ char *ether_str(struct sockaddr_dl *sdl);
char *sec2str(time_t total);
int getaddr(char *host, struct sockaddr_in6 *sin6);
int print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag);
int delete_nl(uint32_t ifindex, char *host);
int delete_nl(uint32_t ifindex, char *host, bool warn);
int set_nl(uint32_t ifindex, struct sockaddr_in6 *dst, struct sockaddr_dl *sdl,
char *host);

13
usr.sbin/ndp/ndp_netlink.c
View File

@ -180,7 +180,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, const struct sockaddr_in6 *
int off = snl_add_msg_attr_nested(&nw, NHA_FREEBSD);
snl_add_msg_attr_u32(&nw, NHAF_KID, r.rta_knh_id);
snl_add_msg_attr_u8(&nw, NHAF_FAMILY, AF_INET);
snl_add_msg_attr_u8(&nw, NHAF_FAMILY, AF_INET6);
snl_add_msg_attr_u32(&nw, NHAF_TABLE, fibnum);
snl_end_attr_nested(&nw, off);
@ -372,13 +372,14 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag)
continue;
}
print_entry(&neigh, &link);
if (cflag) {
char dst_str[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, &dst->sin6_addr, dst_str, sizeof(dst_str));
delete_nl(neigh.nda_ifindex, dst_str);
}
delete_nl(neigh.nda_ifindex, dst_str, false); /* no warn */
} else
print_entry(&neigh, &link);
count++;
snl_clear_lb(&ss_req);
}
@ -391,8 +392,9 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag)
}
int
delete_nl(uint32_t ifindex, char *host)
delete_nl(uint32_t ifindex, char *host, bool warn)
{
#define xo_warnx(...) do { if (warn) { xo_warnx(__VA_ARGS__); } } while(0)
struct snl_state ss = {};
struct snl_writer nw;
struct sockaddr_in6 dst;
@ -458,6 +460,7 @@ delete_nl(uint32_t ifindex, char *host)
snl_free(&ss);
return (e.error != 0);
#undef xo_warnx /* see above */
}
int