aboutsummaryrefslogtreecommitdiff
path: root/pfinet/linux-src/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2017-09-10 16:02:05 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2017-09-10 16:04:31 +0200
commit7d906d22cf1953641303966a756f3c44535001ae (patch)
tree87d0e000164f7c13835efbb5a1d3b8f716bc5b07 /pfinet/linux-src/net/ipv4/tcp_ipv4.c
parent973089f3832df9887259e1927f7ead800d9dd897 (diff)
downloadhurd-7d906d22cf1953641303966a756f3c44535001ae.tar.gz
hurd-7d906d22cf1953641303966a756f3c44535001ae.tar.bz2
hurd-7d906d22cf1953641303966a756f3c44535001ae.zip
pfinet: select UDP/TCP ports randomly
* pfinet/linux-src/include/net/tcp.h (tcp_port_rover): Remove declaration * pfinet/linux-src/include/net/udp.h (udp_port_rover): Likewise. * pfinet/linux-src/net/ipv4/tcp_ipv4.c (tcp_port_rover): Remove variable. (tcp_v4_get_port): Take port hint from net_random() instead of tcp_port_rover. * pfinet/linux-src/net/ipv4/udp.c (udp_port_rover, udp_v4_get_port): Likewise. * pfinet/linux-src/net/ipv6/tcp_ipv6.c (tcp_v6_get_port): Likewise. * pfinet/linux-src/net/ipv6/udp_ipv6.c (udp_v6_get_port): Likewise.
Diffstat (limited to 'pfinet/linux-src/net/ipv4/tcp_ipv4.c')
-rw-r--r--pfinet/linux-src/net/ipv4/tcp_ipv4.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/pfinet/linux-src/net/ipv4/tcp_ipv4.c b/pfinet/linux-src/net/ipv4/tcp_ipv4.c
index df2c8b7c..8a5f7175 100644
--- a/pfinet/linux-src/net/ipv4/tcp_ipv4.c
+++ b/pfinet/linux-src/net/ipv4/tcp_ipv4.c
@@ -123,7 +123,6 @@ int sysctl_local_port_range[2] = { 1024, 4999 };
#else
int sysctl_local_port_range[2] = { 32768, 61000 };
#endif
-int tcp_port_rover = (1024 - 1);
static __inline__ int tcp_hashfn(__u32 laddr, __u16 lport,
__u32 faddr, __u16 fport)
@@ -223,9 +222,9 @@ static int tcp_v4_get_port(struct sock *sk, unsigned short snum)
SOCKHASH_LOCK();
if (snum == 0) {
- int rover = tcp_port_rover;
int low = sysctl_local_port_range[0];
int high = sysctl_local_port_range[1];
+ int rover = net_random() % (high - low) + low;
int remaining = (high - low) + 1;
do { rover++;
@@ -239,7 +238,6 @@ static int tcp_v4_get_port(struct sock *sk, unsigned short snum)
next:
; /* Do nothing. */
} while (--remaining > 0);
- tcp_port_rover = rover;
/* Exhausted local port range during search? */
if (remaining <= 0)