* 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
This commit is contained in:
Ulrich Drepper 2005-05-23 16:40:54 +00:00
parent 60839ab952
commit 3a0cd663c2
2 changed files with 17 additions and 2 deletions

View File

@ -1,5 +1,9 @@
2005-05-23 Ulrich Drepper <drepper@redhat.com> 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. * sysdeps/unix/clock_gettime.c (clock_gettime): Revert last patch.
2005-05-22 Andreas Schwab <schwab@suse.de> 2005-05-22 Andreas Schwab <schwab@suse.de>

View File

@ -49,8 +49,10 @@ bindresvport (int sd, struct sockaddr_in *sin)
int i; int i;
#define STARTPORT 600 #define STARTPORT 600
#define LOWPORT 200
#define ENDPORT (IPPORT_RESERVED - 1) #define ENDPORT (IPPORT_RESERVED - 1)
#define NPORTS (ENDPORT - STARTPORT + 1) #define NPORTS (ENDPORT - STARTPORT + 1)
static short startport = STARTPORT;
if (sin == (struct sockaddr_in *) 0) if (sin == (struct sockaddr_in *) 0)
{ {
@ -71,16 +73,25 @@ bindresvport (int sd, struct sockaddr_in *sin)
res = -1; res = -1;
__set_errno (EADDRINUSE); __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++); sin->sin_port = htons (port++);
if (port > ENDPORT) if (port > ENDPORT)
{ {
port = STARTPORT; port = startport;
} }
res = __bind (sd, sin, sizeof (struct sockaddr_in)); res = __bind (sd, sin, sizeof (struct sockaddr_in));
} }
if (i == nports && startport != LOWPORT)
{
startport = LOWPORT;
nports = STARTPORT - LOWPORT;
goto again;
}
return res; return res;
} }
libc_hidden_def (bindresvport) libc_hidden_def (bindresvport)