mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 22:35:33 +00:00
Code Issues Releases Wiki Activity

net: Dump tun device net id in img

Browse Source 
This adds new tunfile_entry::ns_id field and populates
it in standard socket way. Restore uses this ns_id
to choose correct namespace. Note, we could completelly
skip set_netns() on restore in case of !has_ns_id, but
using top_net_ns invents some definite behaviour.

Signed-off-by: Andrew Vagin <avagin@virtuozzo.com>
ktkhai: comment written/code movings
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
This commit is contained in:
Andrew Vagin
2018-03-02 15:46:45 +03:00
committed by Andrei Vagin
parent 2e5d5a399d
commit 80eaf6c90a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
criu/tun.c
View File

@@ -20,6 +20,7 @@
#include "namespaces.h" #include "namespaces.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "kerndat.h" #include "kerndat.h"
#include "sockets.h"
#include "images/tun.pb-c.h" #include "images/tun.pb-c.h"
@@ -304,6 +305,8 @@ static int dump_tunfile(int lfd, u32 id, const struct fd_parms *p)
pr_err("No net_ns for tun device\n"); pr_err("No net_ns for tun device\n");
return -1; return -1;
} }
tfe.has_ns_id = true;
tfe.ns_id = ns->id;
} }
if (dump_one_reg_file(lfd, id, p)) if (dump_one_reg_file(lfd, id, p))
@@ -356,7 +359,7 @@ struct tunfile_info {
static int tunfile_open(struct file_desc *d, int *new_fd) static int tunfile_open(struct file_desc *d, int *new_fd)
{ {
int fd; int fd, ns_id;
struct tunfile_info *ti; struct tunfile_info *ti;
struct ifreq ifr; struct ifreq ifr;
struct tun_link *tl; struct tun_link *tl;
@@ -366,6 +369,10 @@ static int tunfile_open(struct file_desc *d, int *new_fd)
if (fd < 0) if (fd < 0)
return -1; return -1;
ns_id = ti->tfe->has_ns_id ? ti->tfe->ns_id : top_net_ns->id;
if (set_netns(ns_id))
return -1;
if (!ti->tfe->netdev) if (!ti->tfe->netdev)
/* just-opened tun file */ /* just-opened tun file */
goto ok;; goto ok;;

1
images/tun.proto
View File

@@ -6,6 +6,7 @@ message tunfile_entry {
required uint32 id = 1; required uint32 id = 1;
optional string netdev = 2; optional string netdev = 2;
optional bool detached = 3; optional bool detached = 3;
optional uint32 ns_id = 4;
}; };
message tun_link_entry { message tun_link_entry {