diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2006-08-30 18:02:21 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2006-08-30 18:02:21 +0000 |
| commit | 31a8a2cab802b051882630b7a3ad6df9ccbcadbc (patch) | |
| tree | 2a32d87aba87c862e4820aa8f0f7b929daf60b67 /sbin/ipsecctl | |
| parent | 44d155c12dbd78c40e73fe7c1cc8684d756e0827 (diff) | |
can get EAGAIN when writing to the pfkey socket; same change as bgpd,
ok hshoexer
Diffstat (limited to 'sbin/ipsecctl')
| -rw-r--r-- | sbin/ipsecctl/pfkey.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sbin/ipsecctl/pfkey.c b/sbin/ipsecctl/pfkey.c index 4cdd86c5d13..3c0adc4f6bd 100644 --- a/sbin/ipsecctl/pfkey.c +++ b/sbin/ipsecctl/pfkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkey.c,v 1.45 2006/06/08 22:34:30 hshoexer Exp $ */ +/* $OpenBSD: pfkey.c,v 1.46 2006/08/30 18:02:20 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2003, 2004 Markus Friedl <markus@openbsd.org> @@ -369,17 +369,15 @@ pfkey_flow(int sd, u_int8_t satype, u_int8_t action, u_int8_t direction, iov_cnt++; } len = smsg.sadb_msg_len * 8; - if ((n = writev(sd, iov, iov_cnt)) == -1) { + + do { + n = writev(sd, iov, iov_cnt); + } while (n == -1 && (errno == EAGAIN || errno == EINTR)); + if (n == -1) { warn("writev failed"); ret = -1; - goto out; - } - if (n != len) { - warnx("short write"); - ret = -1; } -out: if (sa_srcid) free(sa_srcid); if (sa_dstid) |