Otherwise we keep using the old netlink socket if we hit EINTR.
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
---
Requires patches 1/3 and 2/3.
include/netlink.h | 2 +-
src/netlink.c | 4 ++--
src/rule.c | 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/netlink.h b/include/netlink.h
index b26ef4598500..66e400d88f19 100644
--- a/include/netlink.h
+++ b/include/netlink.h
@@ -157,7 +157,7 @@ extern void netlink_dump_obj(struct nftnl_obj *nlo, struct netlink_ctx *ctx);
extern int netlink_batch_send(struct netlink_ctx *ctx, struct list_head *err_list);
-extern void netlink_restart(struct mnl_socket *nf_sock);
+extern struct mnl_socket *netlink_restart(struct mnl_socket *nf_sock);
#define netlink_abi_error() \
__netlink_abi_error(__FILE__, __LINE__, strerror(errno));
extern void __noreturn __netlink_abi_error(const char *file, int line, const char *reason);
diff --git a/src/netlink.c b/src/netlink.c
index 755949c965c3..403780ffdefb 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -73,10 +73,10 @@ void netlink_close_sock(struct mnl_socket *nf_sock)
mnl_socket_close(nf_sock);
}
-void netlink_restart(struct mnl_socket *nf_sock)
+struct mnl_socket *netlink_restart(struct mnl_socket *nf_sock)
{
netlink_close_sock(nf_sock);
- nf_sock = netlink_open_sock();
+ return netlink_open_sock();
}
void __noreturn __netlink_abi_error(const char *file, int line,
diff --git a/src/rule.c b/src/rule.c
index 9e24c35c85ae..12ac1310034d 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -229,7 +229,6 @@ int cache_update(struct nft_ctx *nft, enum cmd_ops cmd, struct list_head *msgs)
.msgs = msgs,
.nft = nft,
};
- struct mnl_socket *nf_sock = nft->nf_sock;
struct nft_cache *cache = &nft->cache;
replay:
@@ -244,7 +243,7 @@ replay:
if (ret < 0) {
cache_release(cache);
if (errno == EINTR) {
- netlink_restart(nf_sock);
+ nft->nf_sock = netlink_restart(nft->nf_sock);
goto replay;
}
return -1;
--
2.11.0
