vrrp: General default value if rt_addrprotos does not include keepalived

Signed-off-by: Quentin Armitage <[email protected]>

keepalived/vrrp/vrrp_ipaddress.c

@@ -851,8 +851,7 @@ void
 set_addrproto(void)
 {
 #if HAVE_DECL_IFA_PROTO
-	find_rttables_addrproto("keepalived", &address_protocol);
-	if (!address_protocol)
-		address_protocol = RTPROT_KEEPALIVED;
+	if (!find_rttables_addrproto("keepalived", &address_protocol))
+		create_rttables_addrproto("keepalived", &address_protocol);
 #endif
 }

lib/rttables.c

@@ -578,6 +578,49 @@ get_rttables_scope(uint32_t id)
 }
 
 #if HAVE_DECL_IFA_PROTO
+static const char *
+get_rttables_addrproto(uint32_t id)
+{
+	return get_entry(id, &rt_scopes, RT_ADDRPROTOS_FILE, rtscope_default, 255);
+}
+
+bool
+create_rttables_addrproto(const char *name, uint8_t *id)
+{
+	unsigned val;
+	rt_entry_t *rte;
+
+	/* We need to find a free value - try RTPROT_KEEPALIVED first */
+	val = RTPROT_KEEPALIVED;
+	if (!get_rttables_addrproto(val)) {
+		for (val = 0; val <= 255; val++) {
+			if (get_rttables_addrproto(val))
+				break;
+		}
+	}
+
+	if (val > 255)
+		return false;
+
+	*id = val & 0xff;
+
+	/* Add the entry so other configuration can use it */
+	PMALLOC(rte);
+	if (!rte)
+		return false;
+
+	rte->id = val;
+	rte->name = STRDUP(name);
+	if (!rte->name) {
+		FREE(rte);
+		return false;
+	}
+
+	list_add_tail(&rte->e_list, &rt_addrprotos);
+
+	return true;
+}
+
 bool
 find_rttables_addrproto(const char *name, uint8_t *id)
 {

lib/rttables.h

@@ -36,6 +36,7 @@ extern bool find_rttables_group(const char *, uint32_t *);
 #endif
 extern bool find_rttables_proto(const char *, uint8_t *);
 #if HAVE_DECL_IFA_PROTO
+extern bool create_rttables_addrproto(const char *, uint8_t *);
 extern bool find_rttables_addrproto(const char *, uint8_t *);
 #endif
 extern bool find_rttables_rtntype(const char *, uint8_t *);