ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wireguard: fix udp-port registration

Browse Source 
Type: fix

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
Change-Id: I698ef299316004b797da1e74b64d067caac4bd2d
This commit is contained in:
Artem Glazychev
2020-09-30 01:07:46 +07:00
committed by Matthew Smith
parent e2c9f234e1
commit 124d5e02b3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/wireguard/test/test_wireguard.py
View File

@ -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,

7
src/plugins/wireguard/wireguard_if.c
View File

@ -250,6 +250,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.