[PATCH] ipvsadm: fix list_daemon to handle master/backup status in either position

["Ryan O'Hara" <rohara@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

Attached is a patch that fixes the list_daemon function such that it 
does not assume that the master sync daemon status is always in the 
first position and master sync daemon status is always in the second 
position.

If libipvs uses the netlink interface to retrieve sync daemon status, 
the results are not guaranteed to follow this ordering. As explained in 
a previous email, if libipvs uses the netlink interface to retrieve sync 
daemon status while only a backup sync daemon is running, the backup 
sync daemon status will but in the first position (index 0). This 
differs from the getsockopt interface, which would always put master 
sync daemon status in first position and backup sync daemon status in 
the second position, even when only backup sync daemon exists. Solution 
is to make ipvsadm check both elements of the array for master and backup.

Ryan


[-- Attachment #2: ipvsadm-1.26-fix_list_daemon.patch --]
[-- Type: text/plain, Size: 871 bytes --]

Index: ipvsadm.c
===================================================================
--- ipvsadm.c	(revision 77)
+++ ipvsadm.c	(working copy)
@@ -1631,16 +1631,19 @@
 static void list_daemon(void)
 {
 	ipvs_daemon_t *u;
+	int i;
 
 	if (!(u = ipvs_get_daemon()))
 		exit(1);
 
-	if (u[0].state & IP_VS_STATE_MASTER)
-		printf("master sync daemon (mcast=%s, syncid=%d)\n",
-		       u[0].mcast_ifn, u[0].syncid);
-	if (u[1].state & IP_VS_STATE_BACKUP)
-		printf("backup sync daemon (mcast=%s, syncid=%d)\n",
-		       u[1].mcast_ifn, u[1].syncid);
+	for (i = 0; i < 2; i++) {
+		if (u[i].state & IP_VS_STATE_MASTER)
+			printf("master sync daemon (mcast=%s, syncid=%d)\n",
+			       u[i].mcast_ifn, u[i].syncid);
+		if (u[i].state & IP_VS_STATE_MASTER)
+			printf("master sync daemon (mcast=%s, syncid=%d)\n",
+			       u[i].mcast_ifn, u[i].syncid);
+	}
 	free(u);
 }