[PATCH] Add support for testing IFLA_NET_NS

Vivien Chappelier vivien.chappelier at thomson.net
Tue Oct 28 10:06:13 PDT 2008


---
 include/linux/if_link.h |    2 ++
 ip/iplink.c             |    9 +++++++++
 misc/Makefile           |    2 +-
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index c948395..fab393d 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -79,6 +79,8 @@ enum
 	IFLA_LINKINFO,
 #define IFLA_LINKINFO IFLA_LINKINFO
 	IFLA_NET_NS_PID,
+	IFLA_IFALIAS,
+	IFLA_NET_NS,
 	__IFLA_MAX
 };
 
diff --git a/ip/iplink.c b/ip/iplink.c
index fd23db1..ffb0d39 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -67,6 +67,7 @@ void iplink_usage(void)
 	fprintf(stderr, "	                  [ broadcast LLADDR ]\n");
 	fprintf(stderr, "	                  [ mtu MTU ]\n");
 	fprintf(stderr, "	                  [ netns PID ]\n");
+	fprintf(stderr, "	                  [ nsid NSID ]\n");
 	fprintf(stderr, "       ip link show [ DEVICE ]\n");
 
 	if (iplink_have_newlink()) {
@@ -179,6 +180,7 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
 	char abuf[32];
 	int qlen = -1;
 	int mtu = -1;
+	int net = -1;
 	int netns = -1;
 
 	ret = argc;
@@ -228,6 +230,13 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
                         if (get_integer(&netns, *argv, 0))
                                 invarg("Invalid \"netns\" value\n", *argv);
                         addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4);
+		} else if (strcmp(*argv, "nsid") == 0) {
+                        NEXT_ARG();
+                        if (net != -1)
+                                duparg("nsid", *argv);
+                        if (get_integer(&net, *argv, 0))
+                                invarg("Invalid \"nsid\" value\n", *argv);
+                        addattr_l(&req->n, sizeof(*req), IFLA_NET_NS, &net, 4);
 		} else if (strcmp(*argv, "multicast") == 0) {
 			NEXT_ARG();
 			req->i.ifi_change |= IFF_MULTICAST;
diff --git a/misc/Makefile b/misc/Makefile
index 8c25381..a4c9591 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,7 +1,7 @@
 SSOBJ=ss.o ssfilter.o
 LNSTATOBJ=lnstat.o lnstat_util.o
 
-TARGETS=ss nstat ifstat rtacct arpd lnstat
+TARGETS=ss nstat ifstat rtacct lnstat
 
 include ../Config
 
-- 
1.5.4.4


--------------030407090109010408070306
Content-Type: application/x-gzip;
 name="chnetns.tar.gz"
Content-Transfer-Encoding: base64
Content-Disposition: inline;
 filename="chnetns.tar.gz"

H4sIADsmB0kAA+0Ya0/bSJCv+FeMgFIHhcR2XhVwqFxIEXcBKkJPra5VtNhrvMJZW16Hx137
32/Gj7yB3l1D7+GRIPbsPHce6x3bkzyWqrqyRDAQWo0G/Zqthjn5m8OKaZqG2bRqRtNYMUyj
WbNWoLFMo3IYqphFACs3tvco3VPr/1Kws/iHQRRX7OXooAA36/WH4m/VW/U8/lat3sL4W5QS
YCzHnGn4n8d/XUjbHzoc9lTsiKDi7WtjFKaGwL+qkNN4FoWsSivTaHWvqvF9yNU8WgX29Rx5
7PjiknATyKEUiJ9GruXca5omZAwDJqRODyy6sstgexjArS18uSnB7xogqDga2jEQH3OcCOjf
brJCbJTr8APU6rX6GHkTuYgzxohAckSYYwS5hpjeWfvnfu/ivHNwMkEcxuMX19nVtOTt1hM+
13VcRcYrHuODnhhNxpbXwh2546yVSrAPBpm+qm5FbHtEn7ySCJspDi/Dlzva6mpmOIsDQTQo
pLSL6MuIs+vdSXInIZ80+PDonOxdRCwT4tT/x0Q73GVDPyZifidifdskki+Jo19Sf4ULuu46
KCgNmX7wpn982rkokyllAz3dyzwNeRQFkZ6Fdo0kjYXOSETT8sAKV1c8JibaStcp9866fXIQ
dfTO+qe948OyniZEaRP5ykr8xgM3EbFAeSoqiYu50IYJSyiHKor1XTYQ/j26mPmWkur6TM71
hSQb6LG0va+E7GfR8+JAKp1eSl/NmupOflDC8enB4eF5/+D0w26+KZdCOrQdkHCVIXN7XvCC
XSDexwKgp3k0lfmwuQk+ViqXpLUxLzRdfHBPn4jjeeddr0NOjoOJ5ZgHEx+fCKb1sD9pSZop
a4Tl6uprR4GQVxAHoHzOw4+p2cmzbhrGlOERj4eRpD7xRfvevftbQH7+Y1APTzrL0fHE+W/U
rfz8N8yG1cTz32yYjeL8fw64CAJfgRtEEHMVUxlQG+1cnPaASQeyngoTxVrSfvjzoGmdOzYI
fQ5Dxa74jqZliQcmVLEBVZWnXXhCwa3wfTyFYmZ7wEB5HF+xMJH2NoiuQbIBVyGzOZialjTU
bYkitsPkNJ8QEYRcooC0DZFbaW/AUz09/okcAneh4O8dk+eEvP5P2DV3sTMuQ8fT9T+6/5m1
5P5nWc1WUf/PAcz3dyCvRaqMUWWO0JVAW93Q2+0SbOjdwzfdg6NeCbYD2HgNG3uEO/6xV0qr
cScR8ZUMLyrBDryo2GPidk5rj8jpix8jhFYS2fFp7+Kg20UKB8nfnnfeHL8vVRU2kKnV3J8Z
Es32OZOJoPMTlIFfvJOewxYa/r3j8dyQ139+xVqGjqfqv9lqje//zTrVf82sFfX/HLAuXIkX
u9Gpj7dul256eLt39H5f1F41+/0SfP48gbxDXLOeoT9q2d0wWwyDWx6F9hxThl/MB6SKjdYm
sMwPPfYQC4sG8xzKm8cNRKgQq62nuJG3q6u11hQSv3VWEflKW+f+eCMSsSGL7AXaCJ0YvkC4
cWcYVm1WAcxCQlYnlYrjf7rOwFCqYUhdCdWgBk/E3MabB61LR7j5z9+Of17/ea9fxgjwifo3
W/jNP57/JfVfb1hF/T8HVLdAx7PXwgyED/hx/C4SDJMO9jx2w6Rk/UEQyNdXg7sK5se+BlsQ
iTDEpHSjYJCe9jZc3sNPlS4f0nJX2FwqJBhiX8Fbhcfh6G2XVk4CzFhBrJjfc9/diqT8Uml7
DMX7gkfIUtW0f8R8ctF4cozDgpXBX51Yjl64vAnTKdfMNHI0UUymJiQA9qAG+UQsn2G8S+5V
8EKBVMIBOxgM6AK3lz3gzU3tf5RrZTLh5lfjUzbVSGYk6YiEBhwTU8CEziQ67ZHB3sR0sQwT
A77EtLkZ30jjdq5SG4/4Fg+GYGIyNGqtZUh2M5vxwaIhX9paFw2HckOmTUn91wjJ7Zswdd/6
VN7MHhIitA6ScNM4rHPQbnd6UJoKw9souIrYIIlDgIELsAwq433P5FCnnxF2etZ532k/Lo1M
G8bs0uezIrXcGav0X5lMFVBAAQUUUEABBRRQQAHfGv4AY7S3aAAoAAA=
--------------030407090109010408070306--


More information about the Containers mailing list