Merge pull request #2580 from pqarmitage/updates

Handle updated vrrp_delayed_start and return (none) from inet_sockaddrtos() if address unspecified

Author: pqarmitage

Makefile.am

@@ -65,7 +65,10 @@ dist-hook:
 				if [ -n "`git status --porcelain $$f`" ]; then continue; fi; \
 				if [ ! -f $(top_distdir)/$$f ]; then continue; fi; \
 				touch --date=@`git log -n 1 --format=%ct -- $$f` $(top_distdir)/$$f; \
-			done \
+			done; \
+			cd lib; \
+			make git-commit.h; \
+			cd ..; \
 		fi \
 	fi
 	@rm -f $(distdir)/README

keepalived/core/keepalived_netlink.c

@@ -922,6 +922,14 @@ netlink_if_address_filter(__attribute__((unused)) struct sockaddr_nl *snl, struc
 	if (tb[IFA_ADDRESS] == NULL)
 		tb[IFA_ADDRESS] = tb[IFA_LOCAL];
 
+	/* Ignore tentative addresses - we can't do anything with them */
+#if HAVE_DECL_IFA_FLAGS
+	if ((tb[IFA_FLAGS] ? *(uint32_t *)RTA_DATA(tb[IFA_FLAGS]) : ifa->ifa_flags) & IFA_F_TENTATIVE)
+#else
+	if (ifa->ifa_flags & IFA_F_TENTATIVE)
+#endif
+		return 0;
+
 	/* local interface address */
 	addr.addr = (tb[IFA_LOCAL] ? RTA_DATA(tb[IFA_LOCAL]) : NULL);
 
@@ -1005,52 +1013,39 @@ netlink_if_address_filter(__attribute__((unused)) struct sockaddr_nl *snl, struc
 						else
 							is_tracking_saddr = false;
 
-						if (ifp == (
-#ifdef _HAVE_VRRP_VMAC_
-							    vrrp->family == AF_INET ? VRRP_CONFIGURED_IFP(vrrp) :
-#endif
-							    vrrp->ifp) &&
-						    vrrp->flags_if_fault &&
-						    vrrp->family == ifa->ifa_family &&
+						if (vrrp->family == ifa->ifa_family &&
 						    vrrp->saddr.ss_family == AF_UNSPEC &&
-						    (!__test_bit(VRRP_FLAG_SADDR_FROM_CONFIG, &vrrp->flags) || is_tracking_saddr)) {
-							/* Copy the address */
-							if (ifa->ifa_family == AF_INET)
-								inet_ip4tosockaddr(addr.in, &vrrp->saddr);
-							else
-								inet_ip6tosockaddr(addr.in6, &vrrp->saddr);
-							try_up_instance(vrrp, false, VRRP_FAULT_FL_NO_SOURCE_IP);
-						}
+						    __test_bit(VRRP_FAULT_FL_NO_SOURCE_IP, &vrrp->flags_if_fault) &&
+						    vrrp->ifp) {
+							if (ifp == (
+#ifdef _HAVE_VRRP_VMAC_
+								    vrrp->family == AF_INET ? VRRP_CONFIGURED_IFP(vrrp) :
+#endif
+								    vrrp->ifp) &&
+							    (!__test_bit(VRRP_FLAG_SADDR_FROM_CONFIG, &vrrp->flags) || is_tracking_saddr)) {
+								/* Copy the address */
+								if (ifa->ifa_family == AF_INET)
+									inet_ip4tosockaddr(addr.in, &vrrp->saddr);
+								else
+									inet_ip6tosockaddr(addr.in6, &vrrp->saddr);
+								try_up_instance(vrrp, false, VRRP_FAULT_FL_NO_SOURCE_IP);
+							}
 #ifdef _HAVE_VRRP_VMAC_
-						/* If IPv6 link local and vmac doesn't have an address or we have
-						 * created one ourselves, add/replace the new address on the vmac */
-						else if (vrrp->family == AF_INET6 &&
-							 vrrp->ifp &&
-							 ifp == vrrp->ifp->base_ifp &&
-							 IS_MAC_IP_VLAN(vrrp->ifp) &&
-							 !__test_bit(VRRP_VMAC_XMITBASE_BIT, &vrrp->flags) &&
-							 ifa->ifa_family == AF_INET6 &&
-							 vrrp->ifp->is_ours) {
-							if (vrrp->saddr.ss_family == AF_UNSPEC) {
-								inet_ip6tosockaddr(addr.in6, &vrrp->saddr);
-#if 0
-								if (IN6_IS_ADDR_UNSPECIFIED(&vrrp->ifp->sin6_addr)) {
-									/* This should never happen with the current code since we always
-									 * create a link local address on the VMAC interface.
-									 * However, if in future it is decided not to automatically create
-									 * a link local address on the VMAC interface if the parent interface
-									 * does not have one, then we will need the following code
-									 */
-									if (add_link_local_address(vrrp->ifp, addr.in6) &&
-									    vrrp->flags_if_fault &&
-									    (!__test_bit(VRRP_FLAG_SADDR_FROM_CONFIG, &vrrp->flags) || is_tracking_saddr))
+							/* If IPv6 link local and vmac doesn't have an address or we have
+							 * created one ourselves, add/replace the new address on the vmac */
+							else if (vrrp->family == AF_INET6 &&
+								 IS_MAC_IP_VLAN(vrrp->ifp) &&
+								 vrrp->ifp->is_ours &&
+								 ifp == vrrp->ifp->base_ifp &&
+								 !__test_bit(VRRP_VMAC_XMITBASE_BIT, &vrrp->flags)) {
+									inet_ip6tosockaddr(addr.in6, &vrrp->saddr);
+									if (!__test_bit(VRRP_FLAG_SADDR_FROM_CONFIG, &vrrp->flags) || is_tracking_saddr)
 										try_up_instance(vrrp, false, VRRP_FAULT_FL_NO_SOURCE_IP);
-								} else
-#endif
-								reset_link_local_address(&vrrp->ifp->sin6_addr, vrrp);
+									else
+										reset_link_local_address(&vrrp->ifp->sin6_addr, vrrp);
 							}
-						}
 #endif
+						}
 					}
 				}
 			}

keepalived/vrrp/vrrp.c

@@ -2053,9 +2053,13 @@ vrrp_state_backup(vrrp_t *vrrp, const vrrphdr_t *hd, const char *buf, ssize_t bu
 		vrrp->rlflags = 0 ;
 
 		if (__test_bit(LOG_DETAIL_BIT, &debug)) {
-			char old_master[INET6_ADDRSTRLEN];
-			strcpy(old_master, inet_sockaddrtos(&vrrp->master_saddr));
-			log_message(LOG_INFO, "(%s) master changed from %s to %s", vrrp->iname, old_master, inet_sockaddrtos(&vrrp->pkt_saddr));
+			if (vrrp->master_saddr.ss_family == AF_UNSPEC)
+				log_message(LOG_INFO, "(%s) master set to %s", vrrp->iname, inet_sockaddrtos(&vrrp->pkt_saddr));
+			else {
+				char old_master[INET6_ADDRSTRLEN];
+				strcpy(old_master, inet_sockaddrtos(&vrrp->master_saddr));
+				log_message(LOG_INFO, "(%s) master changed from %s to %s", vrrp->iname, old_master, inet_sockaddrtos(&vrrp->pkt_saddr));
+			}
 		}
 	}
 
@@ -3867,7 +3871,8 @@ vrrp_complete_instance(vrrp_t * vrrp)
 				/* coverity[var_deref_model] - vrrp->configured_ifp is not NULL for VMAC */
 				netlink_link_add_vmac(vrrp, old_interface);
 			}
-		}
+		} else if (old_interface)
+			netlink_link_del_vmac(vrrp);
 
 		if (vrrp->ifp->base_ifp->ifindex &&
 		    !__test_bit(VRRP_VMAC_UP_BIT, &vrrp->flags) &&
@@ -4825,7 +4830,7 @@ vrrp_complete_init(void)
 #endif
 
 #if defined _HAVE_LIBIPSET_
-	if (!global_data->vrrp_iptables_inchain && global_data->using_ipsets) {
+	if (!global_data->vrrp_iptables_inchain && global_data->using_ipsets == true) {
 		log_message(LOG_INFO, "vrrp_ipsets has been specified but not vrrp_iptables - vrrp_ipsets will be ignored");
 		disable_ipsets();
 	}

keepalived/vrrp/vrrp_daemon.c

@@ -506,6 +506,8 @@ delayed_start_clear_thread(__attribute__((unused)) thread_ref_t thread)
 static void
 start_vrrp(data_t *prev_global_data)
 {
+	unsigned delay_remaining;
+
 	/* Clear the flags used for optimising performance */
 	clear_summary_flags();
 
@@ -617,16 +619,18 @@ start_vrrp(data_t *prev_global_data)
 			} else
 				vrrp_delayed_start_time.tv_sec = 0;
 		} else if (vrrp_delayed_start_time.tv_sec) {
+			vrrp_delayed_start_time = timer_sub_long(vrrp_delayed_start_time, prev_global_data->vrrp_startup_delay);
+			vrrp_delayed_start_time = timer_add_long(vrrp_delayed_start_time, global_data->vrrp_startup_delay);
 			if (time_now.tv_sec > vrrp_delayed_start_time.tv_sec ||
 				(time_now.tv_sec == vrrp_delayed_start_time.tv_sec &&
-				 time_now.tv_usec >= vrrp_delayed_start_time.tv_usec))
+				 time_now.tv_usec >= vrrp_delayed_start_time.tv_usec)) {
 				vrrp_delayed_start_time.tv_sec = 0;
-			else {
-				unsigned delay_left;
-				delay_left = (vrrp_delayed_start_time.tv_sec - time_now.tv_sec) * 1000000UL
+				log_message(LOG_INFO, "Reduced delayed start passed");
+			} else {
+				delay_remaining = (vrrp_delayed_start_time.tv_sec - time_now.tv_sec) * 1000000UL
 						+ vrrp_delayed_start_time.tv_usec - time_now.tv_usec;
-				thread_add_timer(master, delayed_start_clear_thread, NULL, delay_left);
-				log_message(LOG_INFO, "Delaying startup for a further %g seconds", delay_left / TIMER_HZ_DOUBLE);
+				thread_add_timer(master, delayed_start_clear_thread, NULL, delay_remaining);
+				log_message(LOG_INFO, "Delaying startup for a further %g seconds", delay_remaining / TIMER_HZ_DOUBLE);
 			}
 		}
 

keepalived/vrrp/vrrp_if.c

@@ -1598,7 +1598,16 @@ setup_interface(vrrp_t *vrrp)
 		}
 	}
 
-	return;
+	/* If we have created a VMAC for the vrrp instance, the VMAC has an address
+	 * (IPv6 only) and the vrrp instance does not have an address, add the
+	 * address to the vrrp instance and try to bring it up. */
+	if (vrrp->family == AF_INET6) {
+		if (IN6_IS_ADDR_UNSPECIFIED(&vrrp->saddr) &&
+		    (__test_bit(VRRP_FAULT_FL_NO_SOURCE_IP, &vrrp->flags_if_fault))) {
+			inet_ip6tosockaddr(&vrrp->ifp->sin6_addr, &vrrp->saddr);
+			try_up_instance(vrrp, false, VRRP_FAULT_FL_NO_SOURCE_IP);
+		}
+	}
 }
 
 #ifdef _HAVE_VRRP_VMAC_

lib/utils.c

@@ -696,6 +696,11 @@ inet_sockaddrtos2(const sockaddr_t *addr, char *addr_str)
 {
 	const void *addr_ip;
 
+	if (addr->ss_family == AF_UNSPEC) {
+		strcpy(addr_str, "(none)");
+		return addr_str;
+	}
+
 	if (addr->ss_family == AF_INET6) {
 		const struct sockaddr_in6 *addr6 = PTR_CAST_CONST(struct sockaddr_in6, addr);
 		addr_ip = &addr6->sin6_addr;