nexthop 1.2.3.4 and nexthop 1.2.3.5 are in a boat

[maxime-leroy]

Description

grout# add nexthop 1.2.3.4 iface p2 id 4
grout# show nexthop
VRF  ID  TYPE  FAMILY  IP       MAC  IFACE  STATE  FLAGS  ORIGIN
0    4   L3    IPv4    1.2.3.4  ?    p2     new           user
grout# add nexthop 1.2.3.5 iface p2 id 5
grout# show nexthop
VRF  ID  TYPE  FAMILY  IP       MAC  IFACE  STATE  FLAGS  ORIGIN
0    4   L3    IPv4    1.2.3.4  ?    p2     new           user
0    5   L3    IPv4    1.2.3.5  ?    p2     new           user
grout# add nexthop 1.2.3.4 iface p2 id 5
error: command failed: File exists
grout# show nexthop
VRF  ID  TYPE  FAMILY  IP       MAC  IFACE  STATE  FLAGS  ORIGIN
0    4   L3    IPv4    1.2.3.4  ?    p2     new           user
grout#

nexthop 1.2.3.5 drops into the water !

Version

v0.11.0-6-g1d296b25

[rjarry]

When the insertion in the hash table fails here:

grout/modules/infra/control/nexthop.c

Lines 761 to 766 in f8f9d50

	if (priv.ipv4 != 0 || !rte_ipv6_addr_is_unspec(&priv.ipv6)) {
	// Add new entry in hash table for fast lookup.
	set_nexthop_key(&key, priv.af, nh->vrf_id, nh->iface_id, &priv.addr);
	if ((ret = rte_hash_add_key_data(hash_by_addr, &key, nh)) < 0)
	return errno_set(-ret);
	}

We should restore the deleted entry:

grout/modules/infra/control/nexthop.c

Lines 750 to 754 in f8f9d50

	if (priv.ipv4 != 0 || !rte_ipv6_addr_is_unspec(&priv.ipv6)) {
	// Free old entry in the hash table.
	set_nexthop_key(&key, priv.af, nh->vrf_id, nh->iface_id, &priv.addr);
	rte_hash_del_key(hash_by_addr, &key);
	}

If any entry was indeed deleted.