From ef8505938aea0f883ebbebe52fd33eb26881b4d8 Mon Sep 17 00:00:00 2001 From: mav Date: Tue, 29 Sep 2009 19:09:17 +0000 Subject: Fix bug, when RADIUS client gave up after single sendto() error, do not trying backup servers. PR: kern/103764, misc/139214 --- lib/libradius/radlib.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'lib/libradius') diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c index 8faaf7e..e4e4a94 100644 --- a/lib/libradius/radlib.c +++ b/lib/libradius/radlib.c @@ -650,17 +650,12 @@ rad_continue_send_request(struct rad_handle *h, int selected, int *fd, n = sendto(h->fd, h->out, h->out_len, 0, (const struct sockaddr *)&h->servers[h->srv].addr, sizeof h->servers[h->srv].addr); - if (n != h->out_len) { - if (n == -1) - generr(h, "sendto: %s", strerror(errno)); - else - generr(h, "sendto: short write"); - return -1; - } - + if (n != h->out_len) + tv->tv_sec = 1; /* Do not wait full timeout if send failed. */ + else + tv->tv_sec = h->servers[h->srv].timeout; h->try++; h->servers[h->srv].num_tries++; - tv->tv_sec = h->servers[h->srv].timeout; tv->tv_usec = 0; *fd = h->fd; -- cgit v1.1