Page MenuHomeFreeBSD
Files F137235364

D53856.id166889.diff
No OneTemporary
Actions

D53856.id166889.diff
View Options

diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c
--- a/sys/netpfil/pf/pf_lb.c
+++ b/sys/netpfil/pf/pf_lb.c
@@ -407,10 +407,18 @@
*/
key.port[sidx] = pd->nsport;
if (!pf_find_state_all_exists(&key, dir)) {
- MPASS(udp_mapping == NULL ||
- *udp_mapping == NULL);
- *nport = pd->nsport;
- return (0);
+ if (udp_mapping && *udp_mapping != NULL) {
+ (*udp_mapping)->endpoints[1].port = pd->nsport;
+ if (pf_udp_mapping_insert(*udp_mapping) == 0) {
+ *nport = pd->nsport;
+ return (0);
+ }
+ } else {
+ MPASS(udp_mapping == NULL ||
+ *udp_mapping == NULL);
+ *nport = pd->nsport;
+ return (0);
+ }
}
} else if (low == high) {
key.port[sidx] = htons(low);
diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh
--- a/tests/sys/netpfil/pf/nat.sh
+++ b/tests/sys/netpfil/pf/nat.sh
@@ -289,6 +289,35 @@
rm -f server2.out
}
+atf_test_case "endpoint_independent_static_port" "cleanup"
+endpoint_independent_static_port_head()
+{
+ atf_set descr 'Test that a client behind NAT gets the same external IP:port for different servers, with static-port'
+ atf_set require.user root
+}
+
+endpoint_independent_static_port_body()
+{
+ endpoint_independent_setup # Sets ${epair_…} variables
+
+ endpoint_independent_common \
+ "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a)" \
+ "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a) static-port sticky-address endpoint-independent"
+
+ # Exhaust the available nat ports
+ for i in $(seq 1 10); do
+ echo "ping" | jexec client nc -u 198.51.100.32 1234 -w 0
+ echo "ping" | jexec client nc -u 198.51.100.22 1234 -w 0
+ done
+}
+
+endpoint_independent_static_port_cleanup()
+{
+ pft_cleanup
+ rm -f server1.out
+ rm -f server2.out
+}
+
atf_test_case "endpoint_independent_pass" "cleanup"
endpoint_independent_pass_head()
{
@@ -930,6 +959,7 @@
atf_add_test_case "nested_anchor"
atf_add_test_case "endpoint_independent_compat"
atf_add_test_case "endpoint_independent_exhaust"
+ atf_add_test_case "endpoint_independent_static_port"
atf_add_test_case "endpoint_independent_pass"
atf_add_test_case "nat6_nolinklocal"
atf_add_test_case "empty_table_source_hash"

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 22, 4:50 PM (21 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25980792
Default Alt Text
D53856.id166889.diff (2 KB)

Event Timeline