From 2b49efeaf3e18e21baf5e2c12922358b23d26b0c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@parallels.com>
Date: Tue, 31 Mar 2015 10:51:08 +0300
Subject: [PATCH] add netns protobuf entry and image, also add conf to net
 device entry

Signed-off-by: Pavel Tikhomirov <ptikhomirov@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 cr-show.c               | 1 +
 image-desc.c            | 1 +
 include/image-desc.h    | 1 +
 include/magic.h         | 1 +
 include/protobuf-desc.h | 5 +++--
 protobuf/netdev.proto   | 7 +++++++
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/cr-show.c b/cr-show.c
index d39029b57..9703a5a65 100644
--- a/cr-show.c
+++ b/cr-show.c
@@ -324,6 +324,7 @@ static struct show_image_info show_infos[] = {
 	SHOW_PLAIN(IRMAP_CACHE),
 	SHOW_PLAIN(CPUINFO),
 	SHOW_PLAIN(USERNS),
+	SHOW_PLAIN(NETNS),
 
 	{ FILE_LOCKS_MAGIC,	PB_FILE_LOCK,		false,	NULL, "3:%u", },
 	{ TCP_STREAM_MAGIC,	PB_TCP_STREAM,		true,	show_tcp_stream, "1:%u 2:%u 3:%u 4:%u 12:%u", },
diff --git a/image-desc.c b/image-desc.c
index 4be7551ac..fc42df760 100644
--- a/image-desc.c
+++ b/image-desc.c
@@ -70,6 +70,7 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY(TCP_STREAM,	"tcp-stream-%x"),
 	FD_ENTRY(MNTS,		"mountpoints-%d"),
 	FD_ENTRY(NETDEV,	"netdev-%d"),
+	FD_ENTRY(NETNS,		"netns-%d"),
 	FD_ENTRY_F(IFADDR,	"ifaddr-%d", O_NOBUF),
 	FD_ENTRY_F(ROUTE,	"route-%d", O_NOBUF),
 	FD_ENTRY_F(IPTABLES,	"iptables-%d", O_NOBUF),
diff --git a/include/image-desc.h b/include/image-desc.h
index 94c307f79..c93e98f6d 100644
--- a/include/image-desc.h
+++ b/include/image-desc.h
@@ -40,6 +40,7 @@ enum {
 	CR_FD_IFADDR,
 	CR_FD_ROUTE,
 	CR_FD_IPTABLES,
+	CR_FD_NETNS,
 	_CR_FD_NETNS_TO,
 
 	CR_FD_PSTREE,
diff --git a/include/magic.h b/include/magic.h
index d9af16cfa..986ba7d12 100644
--- a/include/magic.h
+++ b/include/magic.h
@@ -61,6 +61,7 @@
 #define INOTIFY_WD_MAGIC	0x54562009 /* Svetlogorsk (Rauschen) */
 #define MNTS_MAGIC		0x55563928 /* Petushki */
 #define NETDEV_MAGIC		0x57373951 /* Yaroslavl */
+#define NETNS_MAGIC		0x55933752 /* Dolgoprudny */
 #define TTY_FILES_MAGIC		0x59433025 /* Pushkin */
 #define TTY_INFO_MAGIC		0x59453036 /* Kolpino */
 #define FILE_LOCKS_MAGIC	0x54323616 /* Kaluga */
diff --git a/include/protobuf-desc.h b/include/protobuf-desc.h
index ec4ae7e86..ab7e4f29c 100644
--- a/include/protobuf-desc.h
+++ b/include/protobuf-desc.h
@@ -54,13 +54,14 @@ enum {
 	PB_TIMERFD,
 	PB_CPUINFO,
 	PB_USERNS,
+	PB_NETNS,
 
 	/* PB_AUTOGEN_STOP */
 
 	PB_PAGEMAP_HEAD,
-	PB_IDS,
+	PB_IDS,		/* 50 */
 	PB_SIGACT,
-	PB_NETDEV,		/* 50 */
+	PB_NETDEV,
 	PB_REMAP_FPATH,
 	PB_SK_QUEUES,
 	PB_IPCNS_MSG,
diff --git a/protobuf/netdev.proto b/protobuf/netdev.proto
index 4410a4ad7..0ed6d8502 100644
--- a/protobuf/netdev.proto
+++ b/protobuf/netdev.proto
@@ -24,4 +24,11 @@ message net_device_entry {
 	optional tun_link_entry tun	= 6;
 
 	optional bytes address		= 7;
+
+	repeated int32 conf		= 8;
+}
+
+message netns_entry {
+	repeated int32 def_conf		= 1;
+	repeated int32 all_conf		= 2;
 }