Merge pull request #2456 from pqarmitage/updates

vrrp: check ifindex != 0 before using the interface

keepalived/vrrp/vrrp_if.c

@@ -89,6 +89,9 @@ if_get_by_ifindex(ifindex_t ifindex)
 {
 	interface_t *ifp;
 
+	if (!ifindex)
+		return NULL;
+
 	list_for_each_entry(ifp, &if_queue, e_list) {
 		if (ifp->ifindex == ifindex)
 			return ifp;
@@ -528,6 +531,23 @@ dump_if(FILE *fp, const interface_t *ifp)
 
 	conf_write(fp, " Name = %s", ifp->ifname);
 	conf_write(fp, "   index = %u%s", ifp->ifindex, ifp->ifindex ? "" : " (deleted)");
+
+	if (!ifp->ifindex) {
+		/* This duplicates code below, but it is simpler, and clearer,
+		 * than having lost of "if (ifp->ifindex)" tests */
+#ifdef _HAVE_VRRP_VMAC_
+		if (ifp->is_ours)
+			conf_write(fp, "   I/f created by keepalived");
+#endif
+
+		if (!list_empty(&ifp->tracking_vrrp)) {
+			conf_write(fp, "   Tracking VRRP instances :");
+			if_tracking_vrrp_dump_list(fp, &ifp->tracking_vrrp);
+		}
+
+		return;
+	}
+
 	conf_write(fp, "   IPv4 address = %s",
 			ifp->sin_addr.s_addr ? inet_ntop2(ifp->sin_addr.s_addr) : "(none)");
 	if (!list_empty(&ifp->sin_addr_l)) {

keepalived/vrrp/vrrp_iproute.c

@@ -953,6 +953,7 @@ format_iproute(const ip_route_t *route, char *buf, size_t buf_len)
 
 		if (route->set &&
 		    !route->dont_track &&
+		    route->configured_ifindex &&
 		    (!route->oif || route->oif->ifindex != route->configured_ifindex)) {
 			if ((ifp = if_get_by_ifindex(route->configured_ifindex))) {
 				if ((op += (size_t)snprintf(op, (size_t)(buf_end - op), " [dev %s]", ifp->ifname)) >= buf_end - 1)