diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sunrpc/bindrsvprt.c | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 5197818f0c..e8ffccf8ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-05-23 Ulrich Drepper <drepper@redhat.com> + * sunrpc/bindrsvprt.c (bindresvport): Try harder to find a port. + If we tried looking at the usual range without success extend the + range to even lower ports.q + * sysdeps/unix/clock_gettime.c (clock_gettime): Revert last patch. 2005-05-22 Andreas Schwab <schwab@suse.de> diff --git a/sunrpc/bindrsvprt.c b/sunrpc/bindrsvprt.c index 374518716e..671f229aae 100644 --- a/sunrpc/bindrsvprt.c +++ b/sunrpc/bindrsvprt.c @@ -49,8 +49,10 @@ bindresvport (int sd, struct sockaddr_in *sin) int i; #define STARTPORT 600 +#define LOWPORT 200 #define ENDPORT (IPPORT_RESERVED - 1) #define NPORTS (ENDPORT - STARTPORT + 1) + static short startport = STARTPORT; if (sin == (struct sockaddr_in *) 0) { @@ -71,16 +73,25 @@ bindresvport (int sd, struct sockaddr_in *sin) res = -1; __set_errno (EADDRINUSE); - for (i = 0; i < NPORTS && res < 0 && errno == EADDRINUSE; ++i) + int nports = ENDPORT - startport + 1; + again: + for (i = 0; i < nports && res < 0 && errno == EADDRINUSE; ++i) { sin->sin_port = htons (port++); if (port > ENDPORT) { - port = STARTPORT; + port = startport; } res = __bind (sd, sin, sizeof (struct sockaddr_in)); } + if (i == nports && startport != LOWPORT) + { + startport = LOWPORT; + nports = STARTPORT - LOWPORT; + goto again; + } + return res; } libc_hidden_def (bindresvport) |