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

ip: added support for setting netns on devices

Browse Source 
function                                             old     new   delta
set_netns                                              -     130    +130
do_iplink                                           1252    1315     +63
.rodata                                           104173  104179      +6
packed_usage                                       34020   33993     -27
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 2/1 up/down: 199/-27)           Total: 172 bytes

Signed-off-by: Nicholas Niro <blowfist@xroutine.net>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Nicholas Niro 2020-04-22 23:36:11 -04:00 committed by Denys Vlasenko
parent eb048a450c
commit c28313bb17
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/ip.c
View File

@ -152,7 +152,7 @@
//usage:#define iplink_trivial_usage //usage:#define iplink_trivial_usage
//usage: /*Usage:iplink*/"set IFACE [up|down] [arp on|off] [multicast on|off]\n" //usage: /*Usage:iplink*/"set IFACE [up|down] [arp on|off] [multicast on|off]\n"
//usage: " [promisc on|off] [mtu NUM] [name NAME] [qlen NUM] [address MAC]\n" //usage: " [promisc on|off] [mtu NUM] [name NAME] [qlen NUM] [address MAC]\n"
//usage: " [master IFACE | nomaster]" //usage: " [master IFACE | nomaster] [netns PID]"
// * short help shows only "set" command, long help continues (with just one "\n") // * short help shows only "set" command, long help continues (with just one "\n")
// * and shows all other commands: // * and shows all other commands:
//usage:#define iplink_full_usage "\n" //usage:#define iplink_full_usage "\n"

35
networking/libiproute/iplink.c
View File

@ -152,6 +152,30 @@ static void set_master(char *dev, int master)
xfunc_die(); xfunc_die();
} }
/* Exits on error */
static void set_netns(char *dev, int netns)
{
struct rtnl_handle rth;
struct {
struct nlmsghdr n;
struct ifinfomsg i;
char buf[1024];
} req;
memset(&req, 0, sizeof(req));
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
req.n.nlmsg_flags = NLM_F_REQUEST;
req.n.nlmsg_type = RTM_NEWLINK;
req.i.ifi_family = preferred_family;
xrtnl_open(&rth);
req.i.ifi_index = xll_name_to_index(dev);
//printf("netns %i for %i\n", netns, req.i.ifi_index);
addattr_l(&req.n, sizeof(req), IFLA_NET_NS_PID, &netns, 4);
if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
xfunc_die();
}
/* Exits on error */ /* Exits on error */
static int get_address(char *dev, int *htype) static int get_address(char *dev, int *htype)
{ {
@ -226,6 +250,7 @@ static int do_set(char **argv)
int qlen = -1; int qlen = -1;
int mtu = -1; int mtu = -1;
int master = -1; int master = -1;
int netns = -1;
char *newaddr = NULL; char *newaddr = NULL;
char *newbrd = NULL; char *newbrd = NULL;
struct ifreq ifr0, ifr1; struct ifreq ifr0, ifr1;
@ -234,11 +259,11 @@ static int do_set(char **argv)
/* If you add stuff here, update iplink_full_usage */ /* If you add stuff here, update iplink_full_usage */
static const char keywords[] ALIGN1 = static const char keywords[] ALIGN1 =
"up\0""down\0""name\0""mtu\0""qlen\0""multicast\0" "up\0""down\0""name\0""mtu\0""qlen\0""multicast\0"
"arp\0""promisc\0""address\0" "arp\0""promisc\0""address\0""netns\0"
"master\0""nomaster\0" "master\0""nomaster\0"
"dev\0" /* must be last */; "dev\0" /* must be last */;
enum { ARG_up = 0, ARG_down, ARG_name, ARG_mtu, ARG_qlen, ARG_multicast, enum { ARG_up = 0, ARG_down, ARG_name, ARG_mtu, ARG_qlen, ARG_multicast,
ARG_arp, ARG_promisc, ARG_addr, ARG_arp, ARG_promisc, ARG_addr, ARG_netns,
ARG_master, ARG_nomaster, ARG_master, ARG_nomaster,
ARG_dev }; ARG_dev };
enum { PARM_on = 0, PARM_off }; enum { PARM_on = 0, PARM_off };
@ -276,6 +301,9 @@ static int do_set(char **argv)
master = xll_name_to_index(*argv); master = xll_name_to_index(*argv);
} else if (key == ARG_nomaster) { } else if (key == ARG_nomaster) {
master = 0; master = 0;
} else if (key == ARG_netns) {
NEXT_ARG();
netns = get_unsigned(*argv, "netns");
} else if (key >= ARG_dev) { } else if (key >= ARG_dev) {
/* ^^^^^^ ">=" here results in "dev IFACE" treated as default */ /* ^^^^^^ ">=" here results in "dev IFACE" treated as default */
if (key == ARG_dev) { if (key == ARG_dev) {
@ -463,6 +491,9 @@ static int do_set(char **argv)
if (master != -1) { if (master != -1) {
set_master(dev, master); set_master(dev, master);
} }
if (netns != -1) {
set_netns(dev, netns);
}
if (mask) if (mask)
do_chflags(dev, flags, mask); do_chflags(dev, flags, mask);
return 0; return 0;