diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-09-10 16:02:05 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-09-10 16:04:31 +0200 |
| commit | 7d906d22cf1953641303966a756f3c44535001ae (patch) | |
| tree | 87d0e000164f7c13835efbb5a1d3b8f716bc5b07 /pfinet/linux-src/net/ipv4/udp.c | |
| parent | 973089f3832df9887259e1927f7ead800d9dd897 (diff) | |
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/udp.c')
| -rw-r--r-- | pfinet/linux-src/net/ipv4/udp.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pfinet/linux-src/net/ipv4/udp.c b/pfinet/linux-src/net/ipv4/udp.c index f9be2e04..ff5812a9 100644 --- a/pfinet/linux-src/net/ipv4/udp.c +++ b/pfinet/linux-src/net/ipv4/udp.c @@ -127,20 +127,16 @@ struct udp_mib udp_statistics; struct sock *udp_hash[UDP_HTABLE_SIZE]; -/* Shared by v4/v6 udp. */ -int udp_port_rover = 0; - static int udp_v4_get_port(struct sock *sk, unsigned short snum) { SOCKHASH_LOCK(); if (snum == 0) { + int low = sysctl_local_port_range[0]; + int high = sysctl_local_port_range[1]; int best_size_so_far, best, result, i; - if (udp_port_rover > sysctl_local_port_range[1] || - udp_port_rover < sysctl_local_port_range[0]) - udp_port_rover = sysctl_local_port_range[0]; best_size_so_far = 32767; - best = result = udp_port_rover; + best = result = net_random() % (high - low) + low; for (i = 0; i < UDP_HTABLE_SIZE; i++, result++) { struct sock *sk; int size; @@ -173,7 +169,7 @@ static int udp_v4_get_port(struct sock *sk, unsigned short snum) break; } gotit: - udp_port_rover = snum = result; + snum = result; } else { struct sock *sk2; |