emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ip addr: support change and replace commands

Browse Source 
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Michael Tokarev 2015-05-20 16:27:44 +03:00 committed by Denys Vlasenko
parent 7db312ad26
commit 6a7cd3d4ab
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/ip.c
View File

@ -33,7 +33,7 @@
//usage: "{ {add|del} IFADDR dev STRING | {show|flush}\n" //usage: "{ {add|del} IFADDR dev STRING | {show|flush}\n"
//usage: " [dev STRING] [to PREFIX] }" //usage: " [dev STRING] [to PREFIX] }"
//usage:#define ipaddr_full_usage "\n\n" //usage:#define ipaddr_full_usage "\n\n"
//usage: "ipaddr {add|delete} IFADDR dev STRING\n" //usage: "ipaddr {add|change|replace|delete} IFADDR dev STRING\n"
//usage: "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n" //usage: "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n"
//usage: " [to PREFIX] [label PATTERN]\n" //usage: " [to PREFIX] [label PATTERN]\n"
//usage: " IFADDR := PREFIX | ADDR peer PREFIX\n" //usage: " IFADDR := PREFIX | ADDR peer PREFIX\n"

18
networking/libiproute/ipaddress.c
View File

@ -598,7 +598,7 @@ static int default_scope(inet_prefix *lcl)
} }
/* Return value becomes exitcode. It's okay to not return at all */ /* Return value becomes exitcode. It's okay to not return at all */
static int ipaddr_modify(int cmd, char **argv) static int ipaddr_modify(int cmd, int flags, char **argv)
{ {
static const char option[] ALIGN1 = static const char option[] ALIGN1 =
"peer\0""remote\0""broadcast\0""brd\0" "peer\0""remote\0""broadcast\0""brd\0"
@ -622,7 +622,7 @@ static int ipaddr_modify(int cmd, char **argv)
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
req.n.nlmsg_flags = NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_REQUEST | flags;
req.n.nlmsg_type = cmd; req.n.nlmsg_type = cmd;
req.ifa.ifa_family = preferred_family; req.ifa.ifa_family = preferred_family;
@ -749,16 +749,20 @@ static int ipaddr_modify(int cmd, char **argv)
int FAST_FUNC do_ipaddr(char **argv) int FAST_FUNC do_ipaddr(char **argv)
{ {
static const char commands[] ALIGN1 = static const char commands[] ALIGN1 =
"add\0""delete\0""list\0""show\0""lst\0""flush\0"; /* 0 1 2 3 4 5 6 7 8 */
"add\0""change\0""chg\0""replace\0""delete\0""list\0""show\0""lst\0""flush\0";
int cmd = 2; int cmd = 2;
if (*argv) { if (*argv) {
cmd = index_in_substrings(commands, *argv); cmd = index_in_substrings(commands, *argv);
if (cmd < 0) if (cmd < 0)
invarg(*argv, applet_name); invarg(*argv, applet_name);
argv++; argv++;
if (cmd <= 1) if (cmd <= 4)
return ipaddr_modify((cmd == 0) ? RTM_NEWADDR : RTM_DELADDR, argv); return ipaddr_modify(cmd == 4 ? RTM_DELADDR : RTM_NEWADDR,
cmd == 0 ? NLM_F_CREATE|NLM_F_EXCL :
cmd == 1 || cmd == 2 ? NLM_F_REPLACE :
cmd == 3 ? NLM_F_CREATE|NLM_F_REPLACE :
0, argv);
} }
/* 2 == list, 3 == show, 4 == lst */ return ipaddr_list_or_flush(argv, cmd == 8);
return ipaddr_list_or_flush(argv, cmd == 5);
} }