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

files: Factor out transport name generation

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2012-03-23 11:02:06 +03:00
parent a3ed9db82a
commit ebc1ac8bc5
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
files.c
View File

@@ -226,6 +226,15 @@ struct fdinfo_list_entry *find_fdinfo_list_entry(int pid, int fd, struct fdinfo_
return fle; return fle;
} }
static inline void transport_name_gen(struct sockaddr_un *addr, int *len,
int pid, long fd)
{
addr->sun_family = AF_UNIX;
snprintf(addr->sun_path, UNIX_PATH_MAX, "x/crtools-fd-%d-%ld", pid, fd);
*len = SUN_LEN(addr);
*addr->sun_path = '\0';
}
static int open_transport_fd(int pid, struct fdinfo_entry *fe, static int open_transport_fd(int pid, struct fdinfo_entry *fe,
struct fdinfo_desc *fi) struct fdinfo_desc *fi)
{ {
@@ -237,12 +246,7 @@ static int open_transport_fd(int pid, struct fdinfo_entry *fe,
if (fi->pid == pid) if (fi->pid == pid)
return 0; return 0;
saddr.sun_family = AF_UNIX; transport_name_gen(&saddr, &sun_len, getpid(), fe->addr);
snprintf(saddr.sun_path, UNIX_PATH_MAX,
"X/crtools-fd-%d-%ld", getpid(), fe->addr);
sun_len = SUN_LEN(&saddr);
*saddr.sun_path = '\0';
pr_info("\t%d: Create transport fd for %lx type %d namelen %d users %d\n", pid, pr_info("\t%d: Create transport fd for %lx type %d namelen %d users %d\n", pid,
(unsigned long)fe->addr, fe->type, fe->len, fi->users); (unsigned long)fe->addr, fe->type, fe->len, fi->users);
@@ -314,12 +318,7 @@ static int open_fd(int pid, struct fdinfo_entry *fe,
cr_wait_while(&fle->real_pid, 0); cr_wait_while(&fle->real_pid, 0);
pr_info("Send fd %d to %s\n", (int)fe->addr, saddr.sun_path + 1); pr_info("Send fd %d to %s\n", (int)fe->addr, saddr.sun_path + 1);
transport_name_gen(&saddr, &len, fle->real_pid, fle->fd);
saddr.sun_family = AF_UNIX;
snprintf(saddr.sun_path, UNIX_PATH_MAX,
"X/crtools-fd-%d-%d", fle->real_pid, fle->fd);
len = SUN_LEN(&saddr);
*saddr.sun_path = '\0';
if (send_fd(sock, &saddr, len, fe->addr) < 0) { if (send_fd(sock, &saddr, len, fe->addr) < 0) {
pr_perror("Can't send file descriptor"); pr_perror("Can't send file descriptor");