diff options
| author |   Florin Coras <fcoras@cisco.com> | 2023-01-30 11:18:36 -0800 |
|---|---|---|
| committer |   Dave Barach <vpp@barachs.net> | 2023-02-28 22:50:36 +0000 |
| commit | 3d6156fed8be0c1e3ffe081be16f82be5be603fd (patch) | |
| tree | 78a29e173f1611f2e5a630c93f3d53d67466d440 /src/vnet/session | |
| parent | 045a6ae99db25d3ce8a83d1f291715ff033a7f11 (diff) | |
session: consolidate port alloc logic
Move port allocation logic from transports into generic transport layer.
Type: improvement
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I55a21f185d00f5e118c36bcc4a6ffba2cbda885e
Diffstat (limited to 'src/vnet/session')
| -rw-r--r-- | src/vnet/session/transport.c | 17 | ||||
| -rw-r--r-- | src/vnet/session/transport.h | 8 |
2 files changed, 18 insertions, 7 deletions
diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 8554c730bda..0020d743d9b 100644 --- a/src/vnet/session/transport.c +++ b/src/vnet/session/transport.c @@ -566,7 +566,8 @@ transport_share_local_endpoint (u8 proto, ip46_address_t * lcl_ip, u16 port) * table to mark the pair as used. */ int -transport_alloc_local_port (u8 proto, ip46_address_t * ip) +transport_alloc_local_port (u8 proto, ip46_address_t *lcl_addr, + transport_endpoint_cfg_t *rmt) { u16 min = 1024, max = 65535; /* XXX configurable ? */ transport_main_t *tm = &tp_main; @@ -594,8 +595,18 @@ transport_alloc_local_port (u8 proto, ip46_address_t * ip) break; } - if (!transport_endpoint_mark_used (proto, ip, port)) + if (!transport_endpoint_mark_used (proto, lcl_addr, port)) return port; + + /* IP:port pair already in use, check if 6-tuple available */ + if (session_lookup_connection (rmt->fib_index, lcl_addr, &rmt->ip, port, + rmt->port, proto, rmt->is_ip4)) + continue; + + /* 6-tuple is available so increment lcl endpoint refcount */ + transport_share_local_endpoint (proto, lcl_addr, port); + + return port; } return -1; } @@ -683,7 +694,7 @@ transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t * rmt_cfg, */ if (rmt_cfg->peer.port == 0) { - port = transport_alloc_local_port (proto, lcl_addr); + port = transport_alloc_local_port (proto, lcl_addr, rmt_cfg); if (port < 1) return SESSION_E_NOPORT; *lcl_port = port; diff --git a/src/vnet/session/transport.h b/src/vnet/session/transport.h index 6e8b22a8cac..3cd64c90995 100644 --- a/src/vnet/session/transport.h +++ b/src/vnet/session/transport.h @@ -246,10 +246,10 @@ transport_register_new_protocol (const transport_proto_vft_t * vft, transport_proto_vft_t *transport_protocol_get_vft (transport_proto_t tp); void transport_update_time (clib_time_type_t time_now, u8 thread_index); -int transport_alloc_local_port (u8 proto, ip46_address_t * ip); -int transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t * rmt, - ip46_address_t * lcl_addr, - u16 * lcl_port); +int transport_alloc_local_port (u8 proto, ip46_address_t *ip, + transport_endpoint_cfg_t *rmt); +int transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t *rmt, + ip46_address_t *lcl_addr, u16 *lcl_port); void transport_share_local_endpoint (u8 proto, ip46_address_t * lcl_ip, u16 port); int transport_release_local_endpoint (u8 proto, ip46_address_t *lcl_ip, |