files: Move netlink sock into files image

Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

criu/cr-restore.c

@@ -258,7 +258,6 @@ static struct collect_image_info *cinfos[] = {
 	&pipe_cinfo,
 	&fifo_cinfo,
 	&unix_sk_cinfo,
-	&netlink_sk_cinfo,
 	&eventfd_cinfo,
 	&epoll_cinfo,
 	&epoll_tfd_cinfo,
@@ -279,6 +278,7 @@ static struct collect_image_info *cinfos[] = {
 static struct collect_image_info *cinfos_files[] = {
 	&nsfile_cinfo,
 	&packet_sk_cinfo,
+	&netlink_sk_cinfo,
 };
 
 /* These images are requered to restore namespaces */

criu/files.c

@@ -1698,6 +1698,9 @@ static int collect_one_file(void *o, ProtobufCMessage *base, struct cr_img *i)
 	case FD_TYPES__PACKETSK:
 		ret = collect_one_file_entry(fe, fe->psk->id, &fe->psk->base, &packet_sk_cinfo);
 		break;
+	case FD_TYPES__NETLINKSK:
+		ret = collect_one_file_entry(fe, fe->nlsk->id, &fe->nlsk->base, &netlink_sk_cinfo);
+		break;
 	}
 
 	return ret;

criu/include/image-desc.h

@@ -58,7 +58,6 @@ enum {
 	CR_FD_SK_QUEUES,
 	CR_FD_EXT_FILES,
 	CR_FD_UNIXSK,
-	CR_FD_NETLINK_SK,
 	CR_FD_PIPES,
 	CR_FD_PIPES_DATA,
 	CR_FD_FIFO,
@@ -106,6 +105,7 @@ enum {
 	CR_FD_INETSK,
 	CR_FD_NS_FILES,
 	CR_FD_PACKETSK,
+	CR_FD_NETLINK_SK,
 
 	CR_FD_AUTOFS,
 

criu/sk-netlink.c

@@ -78,6 +78,7 @@ static bool can_dump_netlink_sk(int lfd)
 static int dump_one_netlink_fd(int lfd, u32 id, const struct fd_parms *p)
 {
 	struct netlink_sk_desc *sk;
+	FileEntry fe = FILE_ENTRY__INIT;
 	NetlinkSkEntry ne = NETLINK_SK_ENTRY__INIT;
 	SkOptsEntry skopts = SK_OPTS_ENTRY__INIT;
 
@@ -137,7 +138,11 @@ static int dump_one_netlink_fd(int lfd, u32 id, const struct fd_parms *p)
 	if (dump_socket_opts(lfd, &skopts))
 		goto err;
 
-	if (pb_write_one(img_from_set(glob_imgset, CR_FD_NETLINK_SK), &ne, PB_NETLINK_SK))
+	fe.type = FD_TYPES__NETLINKSK;
+	fe.id = ne.id;
+	fe.nlsk = ≠
+
+	if (pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE))
 		goto err;
 
 	return 0;

images/fdinfo.proto

@@ -4,6 +4,7 @@ import "regfile.proto";
 import "sk-inet.proto";
 import "ns.proto";
 import "packet-sock.proto";
+import "sk-netlink.proto";
 
 enum fd_types {
 	UND		= 0;
@@ -40,4 +41,5 @@ message file_entry {
 	optional inet_sk_entry		isk	= 4;
 	optional ns_file_entry		nsf	= 5;
 	optional packet_sock_entry	psk	= 6;
+	optional netlink_sk_entry	nlsk	= 7;
 }