proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2026-02-01 18:07:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ip, token: add del command

Browse Source 
For convenience also add a del command for deleting a token and
update the man page accordingly.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Daniel Borkmann 2016-05-24 00:47:38 +02:00 committed by Stephen Hemminger
parent 4273f100ed
commit f8daee42a5
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ip/iptoken.c
View File

@ -38,7 +38,7 @@ static void usage(void) __attribute__((noreturn));
static void usage(void)
{
fprintf(stderr, "Usage: ip token [ list | set | get ] [ TOKEN ] [ dev DEV ]\n");
fprintf(stderr, "Usage: ip token [ list | set | del | get ] [ TOKEN ] [ dev DEV ]\n");
exit(-1);
}
@ -117,7 +117,7 @@ static int iptoken_list(int argc, char **argv)
return 0;
}
static int iptoken_set(int argc, char **argv)
static int iptoken_set(int argc, char **argv, bool delete)
{
struct {
struct nlmsghdr n;
@ -125,10 +125,9 @@ static int iptoken_set(int argc, char **argv)
char buf[512];
} req;
struct rtattr *afs, *afs6;
bool have_token = false, have_dev = false;
inet_prefix addr;
bool have_token = delete, have_dev = false;
inet_prefix addr = { .bytelen = 16, };
memset(&addr, 0, sizeof(addr));
memset(&req, 0, sizeof(req));
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
@ -149,13 +148,7 @@ static int iptoken_set(int argc, char **argv)
if (matches(*argv, "help") == 0)
usage();
if (!have_token) {
afs = addattr_nest(&req.n, sizeof(req), IFLA_AF_SPEC);
afs6 = addattr_nest(&req.n, sizeof(req), AF_INET6);
get_prefix(&addr, *argv, req.ifi.ifi_family);
addattr_l(&req.n, sizeof(req), IFLA_INET6_TOKEN,
&addr.data, addr.bytelen);
addattr_nest_end(&req.n, afs6);
addattr_nest_end(&req.n, afs);
have_token = true;
}
}
@ -171,6 +164,13 @@ static int iptoken_set(int argc, char **argv)
return -1;
}
afs = addattr_nest(&req.n, sizeof(req), IFLA_AF_SPEC);
afs6 = addattr_nest(&req.n, sizeof(req), AF_INET6);
addattr_l(&req.n, sizeof(req), IFLA_INET6_TOKEN,
&addr.data, addr.bytelen);
addattr_nest_end(&req.n, afs6);
addattr_nest_end(&req.n, afs);
if (rtnl_talk(&rth, &req.n, NULL, 0) < 0)
return -2;
@ -189,7 +189,9 @@ int do_iptoken(int argc, char **argv)
return iptoken_list(argc - 1, argv + 1);
} else if (matches(argv[0], "set") == 0 ||
matches(argv[0], "add") == 0) {
return iptoken_set(argc - 1, argv + 1);
return iptoken_set(argc - 1, argv + 1, false);
} else if (matches(argv[0], "delete") == 0) {
return iptoken_set(argc - 1, argv + 1, true);
} else if (matches(argv[0], "get") == 0) {
return iptoken_list(argc - 1, argv + 1);
} else if (matches(argv[0], "help") == 0)

13
man/man8/ip-token.8
View File

@ -17,6 +17,10 @@ ip-token \- tokenized interface identifier support
.B dev
.IR DEV
.ti -8
.B ip token del dev
.IR DEV
.ti -8
.B ip token get
.RB "[ " dev
@ -37,8 +41,7 @@ IPv6 Identifiers are described in the draft
[1]: <draft-chown-6man-tokenised-ipv6-identifiers-02>.
.SS ip token set - set an interface token
set the interface token to the kernel. Once a token is set, it cannot be
removed from the interface, only overwritten.
set the interface token to the kernel.
.TP
.I TOKEN
the interface identifier token address.
@ -46,6 +49,12 @@ the interface identifier token address.
.BI dev " DEV"
the networking interface.
.SS ip token del - delete an interface token
delete the interface token from the kernel.
.TP
.BI dev " DEV"
the networking interface.
.SS ip token get - get the interface token from the kernel
show a tokenized interface identifier of a particular networking device.
.B Arguments: