Handle EINTR return from sendto() in ipset.c

This commit is contained in:
Simon Kelley
2013-02-23 19:22:37 +00:00
parent b3538f1100
commit ab6ede7e04

View File

@@ -97,6 +97,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
struct nlattr *nested[2]; struct nlattr *nested[2];
uint8_t proto; uint8_t proto;
int addrsz = INADDRSZ; int addrsz = INADDRSZ;
ssize_t rc;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (af == AF_INET6) if (af == AF_INET6)
@@ -137,10 +138,9 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
nested[1]->nla_len = (void *)buffer + NL_ALIGN(nlh->nlmsg_len) - (void *)nested[1]; nested[1]->nla_len = (void *)buffer + NL_ALIGN(nlh->nlmsg_len) - (void *)nested[1];
nested[0]->nla_len = (void *)buffer + NL_ALIGN(nlh->nlmsg_len) - (void *)nested[0]; nested[0]->nla_len = (void *)buffer + NL_ALIGN(nlh->nlmsg_len) - (void *)nested[0];
if (sendto(ipset_sock, buffer, nlh->nlmsg_len, 0, (struct sockaddr *)&snl, sizeof(snl)) < 0) while ((rc = sendto(ipset_sock, buffer, nlh->nlmsg_len, 0,
return -1; (struct sockaddr *)&snl, sizeof(snl))) == -1 && retry_send());
return rc;
return 0;
} }