65 lines
1.7 KiB
Diff
65 lines
1.7 KiB
Diff
|
commit c254b435007ebd4ed471737198975d5ccf4e7949
|
||
|
|
Author: Steve Dickson <steved@redhat.com>
|
||
|
|
Date: Thu Apr 26 17:20:21 2007 -0400
|
||
|
|
|
||
|
|
Added a optimization to bindresvport that allows more
|
||
|
|
ports to be tried.
|
||
|
|
|
||
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||
|
|
|
||
|
|
diff --git a/src/bindresvport.c b/src/bindresvport.c
|
||
|
|
index b197efa..bc75d29 100644
|
||
|
|
--- a/src/bindresvport.c
|
||
|
|
+++ b/src/bindresvport.c
|
||
|
|
@@ -62,6 +62,7 @@ bindresvport(sd, sin)
|
||
|
|
#ifdef __linux__
|
||
|
|
|
||
|
|
#define STARTPORT 600
|
||
|
|
+#define LOWPORT 512
|
||
|
|
#define ENDPORT (IPPORT_RESERVED - 1)
|
||
|
|
#define NPORTS (ENDPORT - STARTPORT + 1)
|
||
|
|
|
||
|
|
@@ -76,10 +77,13 @@ bindresvport_sa(sd, sa)
|
||
|
|
#ifdef INET6
|
||
|
|
struct sockaddr_in6 *sin6;
|
||
|
|
#endif
|
||
|
|
- u_int16_t port;
|
||
|
|
u_int16_t *portp;
|
||
|
|
+ static u_int16_t port;
|
||
|
|
+ static short startport = STARTPORT;
|
||
|
|
socklen_t salen;
|
||
|
|
- int i;
|
||
|
|
+ int nports = ENDPORT - startport + 1;
|
||
|
|
+ int endport = ENDPORT;
|
||
|
|
+ int i;
|
||
|
|
|
||
|
|
if (sa == NULL) {
|
||
|
|
salen = sizeof(myaddr);
|
||
|
|
@@ -119,13 +123,22 @@ bindresvport_sa(sd, sa)
|
||
|
|
}
|
||
|
|
res = -1;
|
||
|
|
errno = EADDRINUSE;
|
||
|
|
- for (i = 0; i < NPORTS && res < 0 && errno == EADDRINUSE; i++) {
|
||
|
|
+ again:
|
||
|
|
+ for (i = 0; i < nports; ++i) {
|
||
|
|
*portp = htons(port++);
|
||
|
|
- if (port > ENDPORT) {
|
||
|
|
- port = STARTPORT;
|
||
|
|
- }
|
||
|
|
+ if (port > endport)
|
||
|
|
+ port = startport;
|
||
|
|
res = bind(sd, sa, salen);
|
||
|
|
+ if (res >= 0 || errno != EADDRINUSE)
|
||
|
|
+ break;
|
||
|
|
}
|
||
|
|
+ if (i == nports && startport != LOWPORT) {
|
||
|
|
+ startport = LOWPORT;
|
||
|
|
+ endport = STARTPORT - 1;
|
||
|
|
+ nports = STARTPORT - LOWPORT;
|
||
|
|
+ port = LOWPORT + port % (STARTPORT - LOWPORT);
|
||
|
|
+ goto again;
|
||
|
|
+ }
|
||
|
|
return (res);
|
||
|
|
}
|
||
|
|
#else
|