mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 06:45:35 +00:00
Code Issues Releases Wiki Activity

netlink: return errno from do_rtnl_req

Browse Source 
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2013-03-27 23:50:58 +04:00
committed by Pavel Emelyanov
parent 421ceffaa5
commit 4a6ed33203
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libnetlink.c
View File

@@ -34,7 +34,7 @@ static int nlmsg_receive(char *buf, int len, int (*cb)(struct nlmsghdr *, void *
if (*len < 0) { if (*len < 0) {
pr_err("ERROR %d reported by netlink (%s)\n", pr_err("ERROR %d reported by netlink (%s)\n",
*len, strerror(-*len)); *len, strerror(-*len));
return -1; return *len;
} }
return 0; return 0;
@@ -51,7 +51,7 @@ static int nlmsg_receive(char *buf, int len, int (*cb)(struct nlmsghdr *, void *
return 0; return 0;
pr_err("ERROR %d reported by netlink\n", err->error); pr_err("ERROR %d reported by netlink\n", err->error);
return -1; return err->error;
} }
if (cb(hdr, arg)) if (cb(hdr, arg))
return -1; return -1;
@@ -67,6 +67,7 @@ int do_rtnl_req(int nl, void *req, int size,
struct sockaddr_nl nladdr; struct sockaddr_nl nladdr;
struct iovec iov; struct iovec iov;
static char buf[4096]; static char buf[4096];
int err;
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.msg_name = &nladdr; msg.msg_name = &nladdr;
@@ -81,6 +82,7 @@ int do_rtnl_req(int nl, void *req, int size,
iov.iov_len = size; iov.iov_len = size;
if (sendmsg(nl, &msg, 0) < 0) { if (sendmsg(nl, &msg, 0) < 0) {
err = -errno;
pr_perror("Can't send request message"); pr_perror("Can't send request message");
goto err; goto err;
} }
@@ -89,7 +91,6 @@ int do_rtnl_req(int nl, void *req, int size,
iov.iov_len = sizeof(buf); iov.iov_len = sizeof(buf);
while (1) { while (1) {
int err;
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.msg_name = &nladdr; msg.msg_name = &nladdr;
@@ -102,6 +103,7 @@ int do_rtnl_req(int nl, void *req, int size,
if (errno == EINTR) if (errno == EINTR)
continue; continue;
else { else {
err = -errno;
pr_perror("Error receiving nl report"); pr_perror("Error receiving nl report");
goto err; goto err;
} }
@@ -119,7 +121,7 @@ int do_rtnl_req(int nl, void *req, int size,
return 0; return 0;
err: err:
return -1; return err;
} }
int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,