diff options
| author |   Artem Glazychev <artem.glazychev@xored.com> | 2020-09-30 01:07:46 +0700 |
|---|---|---|
| committer |   Matthew Smith <mgsmith@netgate.com> | 2020-09-30 00:16:53 +0000 |
| commit | 124d5e02b31c47a78dba709699408b4e9d9e29f5 (patch) | |
| tree | bece5cc08655ee432e0ca5fc149e8444ddcca204 | |
| parent | e2c9f234e1a3a657595d61996e376cf799f0a54b (diff) | |
wireguard: fix udp-port registration
Type: fix
Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
Change-Id: I698ef299316004b797da1e74b64d067caac4bd2d
| -rwxr-xr-x | src/plugins/wireguard/test/test_wireguard.py | 6 | ||||
| -rw-r--r-- | src/plugins/wireguard/wireguard_if.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/plugins/wireguard/test/test_wireguard.py b/src/plugins/wireguard/test/test_wireguard.py index cee1e938bb0..82ba2625498 100755 --- a/src/plugins/wireguard/test/test_wireguard.py +++ b/src/plugins/wireguard/test/test_wireguard.py @@ -488,7 +488,7 @@ class TestWg(VppTestCase): wg_output_node_name = '/err/wg-output-tun/' wg_input_node_name = '/err/wg-input/' - port = 12323 + port = 12333 # Create interfaces wg0 = VppWgInterface(self, @@ -602,7 +602,7 @@ class TestWg(VppTestCase): def test_wg_multi_peer(self): """ multiple peer setup """ - port = 12323 + port = 12343 # Create interfaces wg0 = VppWgInterface(self, @@ -670,7 +670,7 @@ class WireguardHandoffTests(TestWg): wg_output_node_name = '/err/wg-output-tun/' wg_input_node_name = '/err/wg-input/' - port = 12323 + port = 12353 # Create interfaces wg0 = VppWgInterface(self, diff --git a/src/plugins/wireguard/wireguard_if.c b/src/plugins/wireguard/wireguard_if.c index 46abdf6eb4d..3c59407e3b7 100644 --- a/src/plugins/wireguard/wireguard_if.c +++ b/src/plugins/wireguard/wireguard_if.c @@ -251,6 +251,13 @@ wg_if_create (u32 user_instance, *sw_if_indexp = (u32) ~ 0; /* + * Check if the required port is already in use + */ + udp_dst_port_info_t *pi = udp_get_dst_port_info (&udp_main, port, UDP_IP4); + if (pi) + return VNET_API_ERROR_UDP_PORT_TAKEN; + + /* * Allocate a wg_if instance. Either select on dynamically * or try to use the desired user_instance number. */ |