From ccb6289984f7046145f399c1bfd6566fe8ee11d0 Mon Sep 17 00:00:00 2001 From: Peter Anvin Date: Thu, 13 Oct 2005 15:20:41 -0700 Subject: [PATCH] Actually do loop... --- tftpd/tftpd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c index 30d20a3..5e2a26e 100644 --- a/tftpd/tftpd.c +++ b/tftpd/tftpd.c @@ -288,10 +288,12 @@ pick_port_bind(int sockfd, struct sockaddr_in *myaddr) myaddr->sin_port = htons(port); if (bind(sockfd, (struct sockaddr *)myaddr, sizeof *myaddr) < 0) { - if ( portrange && (errno == EINVAL || errno == EADDRINUSE) ) - continue; /* Should not happen in normal operation, but try again */ + /* Some versions of Linux return EINVAL instead of EADDRINUSE */ + if ( !portrange || !(errno != EINVAL && errno != EADDRINUSE) ) + return -1; - return -1; + /* Normally, we shouldn't have to loop, but some situations involving + aborted transfers make it possible. */ } else { return 0; }