From 4402f3381b369ae47963ef8936c8f9672697d8db Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sat, 2 Jan 2021 14:20:25 +0100 Subject: ipcpd: Single UDP port for the ipcpd-udp The UDP layer will now use a single (configurable) UDP port, default 3435. This makes it easer to allocate flows as a client from behind a NAT firewall without having to configure port forwarding rules. So basically, from now on Ouroboros traffic is transported over a bidirectional : UDP tunnel. The reason for not using/allowing different client/server ports is that it would require reading from different sockets using select() or something similar, but since we need the EID anyway (mgmt packets arrive on the same server UDP port), there's not a lot of benefit in doing it. Now the operation is similar to the ipcpd-eth, with the port somewhat functioning as a "layer name", where in UDP, the Ethertype functions as a "layer name". Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/lib/ipcp_config.proto | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/ipcp_config.proto') diff --git a/src/lib/ipcp_config.proto b/src/lib/ipcp_config.proto index 9cbf1e49..185d9af7 100644 --- a/src/lib/ipcp_config.proto +++ b/src/lib/ipcp_config.proto @@ -40,12 +40,11 @@ message ipcp_config_msg { // Config for UDP optional uint32 ip_addr = 9; optional uint32 dns_addr = 10; - optional uint32 clt_port = 11; - optional uint32 srv_port = 12; + optional uint32 port = 11; // Config for the Ethernet - optional string dev = 13; + optional string dev = 12; // Config for DIX Ethernet - optional uint32 ethertype = 14; + optional uint32 ethertype = 13; } enum enroll_code { -- cgit v1.2.3