mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 01:51:26 +00:00
Code Issues Releases Wiki Activity

conntrack: Handle persistent selection for IP addresses.

Browse Source 
The patch, when 'persistent' flag is specified, makes the IP selection
in a range persistent across reboots.

Signed-off-by: Paolo Valerio <pvalerio@redhat.com>
Acked-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Simon Horman <horms@ovn.org>
This commit is contained in:
Paolo Valerio 2024-02-16 18:19:14 +01:00 committed by Simon Horman
parent 99413ec261
commit afdc1171a8
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -2,7 +2,8 @@ Post-v3.3.0
--------------------
- Userspace datapath:
* Conntrack now supports 'random' flag for selecting ports in a range
while natting.
while natting and 'persistent' flag for selection of the IP address
from a range.
v3.3.0 - 16 Feb 2024

25
lib/conntrack.c
View File

@ -2202,17 +2202,21 @@ nat_range_hash(const struct conn_key *key, uint32_t basis,
{
uint32_t hash = basis;
if (!basis) {
hash = ct_addr_hash_add(hash, &key->src.addr);
} else {
hash = ct_endpoint_hash_add(hash, &key->src);
hash = ct_endpoint_hash_add(hash, &key->dst);
}
hash = ct_addr_hash_add(hash, &nat_info->min_addr);
hash = ct_addr_hash_add(hash, &nat_info->max_addr);
hash = hash_add(hash,
((uint32_t) nat_info->max_port << 16)
| nat_info->min_port);
hash = ct_endpoint_hash_add(hash, &key->src);
hash = ct_endpoint_hash_add(hash, &key->dst);
hash = hash_add(hash, (OVS_FORCE uint32_t) key->dl_type);
hash = hash_add(hash, key->nw_proto);
hash = hash_add(hash, key->zone);
/* The purpose of the second parameter is to distinguish hashes of data of
* different length; our data always has the same length so there is no
* value in counting. */
@ -2388,10 +2392,19 @@ nat_get_unique_tuple(struct conntrack *ct, struct conn *conn,
fwd_key->nw_proto == IPPROTO_SCTP;
uint16_t min_dport, max_dport, curr_dport;
uint16_t min_sport, max_sport, curr_sport;
uint32_t hash, port_off;
uint32_t hash, port_off, basis;
basis = (nat_info->nat_flags & NAT_PERSISTENT) ? 0 : ct->hash_basis;
hash = nat_range_hash(fwd_key, basis, nat_info);
if (nat_info->nat_flags & NAT_RANGE_RANDOM) {
port_off = random_uint32();
} else if (basis) {
port_off = hash;
} else {
port_off = nat_range_hash(fwd_key, ct->hash_basis, nat_info);
}
hash = nat_range_hash(fwd_key, ct->hash_basis, nat_info);
port_off = nat_info->nat_flags & NAT_RANGE_RANDOM ? random_uint32() : hash;
min_addr = nat_info->min_addr;
max_addr = nat_info->max_addr;

1
lib/conntrack.h
View File

@ -79,6 +79,7 @@ enum nat_action_e {
enum nat_flags_e {
NAT_RANGE_RANDOM = 1 << 0,
NAT_PERSISTENT = 1 << 1,
};
struct nat_action_info_t {

2
lib/dpif-netdev.c
View File

@ -9413,6 +9413,8 @@ dp_execute_cb(void *aux_, struct dp_packet_batch *packets_,
nat_action_info.nat_flags |= NAT_RANGE_RANDOM;
break;
case OVS_NAT_ATTR_PERSISTENT:
nat_action_info.nat_flags |= NAT_PERSISTENT;
break;
case OVS_NAT_ATTR_PROTO_HASH:
break;
case OVS_NAT_ATTR_UNSPEC: