[PATCH 1/2] ipvsadm: Fix wrong format of -o option in FMT_RULE listing

[PATCH 1/2] ipvsadm: Fix wrong format of -o option in FMT_RULE listing

[Krzysztof Gajdemski]

'ipvsadm -S' listed one-packet scheduling option in wrong format
('ops' instead of '--ops' or '-o') preventing any service with OPS
feature from restoring using 'ipvsadm -R'.  Now we use '-o' which
works well with save/restore commands.

Signed-off-by: Krzysztof Gajdemski <songo@debian.org.pl>
---
 ipvsadm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipvsadm.c b/ipvsadm.c
index 9afd125..587bfc1 100644
--- a/ipvsadm.c
+++ b/ipvsadm.c
@@ -1487,7 +1487,7 @@ print_service_entry(ipvs_service_entry_t *se, unsigned int format)
 		if (se->pe_name[0])
 			printf(" pe %s", se->pe_name);
 		if (se->flags & IP_VS_SVC_F_ONEPACKET)
-			printf(" ops");
+			printf(" -o");
 	} else if (format & FMT_STATS) {
 		printf("%-33s", svc_name);
 		print_largenum(se->stats.conns, format);
-- 
1.7.10.4

[PATCH 2/2] ipvsadm: Show 'ops' flag regardless of service persistence

[Krzysztof Gajdemski]

In print_service_entry() 'ops' option is displayed only for services
which have the IP_VS_SVC_F_PERSISTENT flag set. However, it should be
displayed for any VS with one-packet scheduling because OPS can be
also used without persistence.

Signed-off-by: Krzysztof Gajdemski <songo@debian.org.pl>
---
 ipvsadm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipvsadm.c b/ipvsadm.c
index 587bfc1..45a71af 100644
--- a/ipvsadm.c
+++ b/ipvsadm.c
@@ -1517,9 +1517,9 @@ print_service_entry(ipvs_service_entry_t *se, unsigned int format)
 					printf(" mask %i", se->netmask);
 			if (se->pe_name[0])
 				printf(" pe %s", se->pe_name);
-			if (se->flags & IP_VS_SVC_F_ONEPACKET)
-				printf(" ops");
 		}
+		if (se->flags & IP_VS_SVC_F_ONEPACKET)
+			printf(" ops");
 	}
 	printf("\n");
 
-- 
1.7.10.4