--- orig/ipvsadm.8
+++ mod/ipvsadm.8
@@ -314,12 +314,9 @@
 .B -w, --weight \fIweight\fP
 \fIWeight\fP is an integer specifying the capacity  of a server
 relative to the others in the pool. The valid values of \fIweight\fP
-are 0 through to 65535. The default is 1. Quiescent servers are
-specified with a weight of zero. A quiescent server will receive no
-new jobs but still serve the existing jobs, for all scheduling
-algorithms distributed with the Linux Virtual Server. Setting a
-quiescent server may be useful if the server is overloaded or needs to
-be taken out of service for maintenance.
+are 0 through to 65535. The default is 1. If the weight is 0 the server is 
+marked as quiecent, for more information on this see the \fIquiescent\fP 
+option for more details.
 .TP
 .B -x, --u-threshold \fIuthreshold\fP
 \fIuthreshold\fP is an integer specifying the upper connection
@@ -340,6 +337,26 @@
 will receive new connections when the number of its connections drops
 below three forth of its upper connection threshold.
 .TP
+.B --quiescent
+Marks a destination as quiescent.  A quiescent server will receive no new
+jobs but still serve the existing jobs, for all scheduling algorithms
+distributed with the Linux Virtual Server.  Setting a quiescent server may
+be useful if the server is overloaded or needs to be taken out of service
+for maintenance.
+.sp
+This flag is automatically set if the weight of a destination is set to
+zero. It is overriden by \fIoffline\fP.
+.TP
+.B --offline
+Marks a destination as offline. When offline a destination
+will not accept any new connections, and all existing
+connections wil be closed. This is as if the destination
+was deleted, but allows offline servers to be viewed
+along their online and quiescent counterparts in the
+lvs services table.
+.sp
+This flag overrides \fIquiescent\fP.
+.TP
 .B --mcast-interface \fIinterface\fP
 Specify the multicast interface that the sync master daemon sends
 outgoing multicasts through, or the sync backup daemon listens to for
@@ -387,6 +404,13 @@
 connection is used to forward the actual connections from the same
 client/network to the same server.
 .TP
+.B --connflags
+When used in conjunction with \fIlist\fP,
+output information on the flags associated with destinations. 
+The flags are O if the destination is marked as offline
+and Q if it is quiescent. See the \fIoffline\fP and \fIquiescent\fP
+options for more information
+.TP
 .B --sort
 Sort the list of virtual services and real servers. The virtual
 service entries are sorted in ascending order by <protocol, address,


--- orig/ipvsadm.c
+++ mod/ipvsadm.c
@@ -54,6 +54,7 @@
  *                                processing options.
  *        Alexandre Cassen    :   added ipvs_syncd SyncdID support to filter
  *                                incoming sync messages.
+ *        Horms               :   Added quescent, offline and destflags
  *
  *
  *      ippfvsadm - Port Fowarding & Virtual Server ADMinistration program
@@ -161,28 +162,31 @@
 	"zero",
 };
 
-#define OPT_NONE		0x00000
-#define OPT_NUMERIC		0x00001
-#define OPT_CONNECTION		0x00002
-#define OPT_SERVICE		0x00004
-#define OPT_SCHEDULER		0x00008
-#define OPT_PERSISTENT		0x00010
-#define OPT_NETMASK		0x00020
-#define OPT_SERVER		0x00040
-#define OPT_FORWARD		0x00080
-#define OPT_WEIGHT		0x00100
-#define OPT_UTHRESHOLD		0x00200
-#define OPT_LTHRESHOLD		0x00400
-#define OPT_MCAST		0x00800
-#define OPT_TIMEOUT		0x01000
-#define OPT_DAEMON		0x02000
-#define OPT_STATS		0x04000
-#define OPT_RATE		0x08000
-#define OPT_THRESHOLDS		0x10000
-#define OPT_PERSISTENTCONN	0x20000
-#define OPT_SORT		0x40000
-#define OPT_SYNCID		0x80000
-#define NUMBER_OF_OPT		20
+#define OPT_NONE		0x000000
+#define OPT_NUMERIC		0x000001
+#define OPT_CONNECTION		0x000002
+#define OPT_SERVICE		0x000004
+#define OPT_SCHEDULER		0x000008
+#define OPT_PERSISTENT		0x000010
+#define OPT_NETMASK		0x000020
+#define OPT_SERVER		0x000040
+#define OPT_FORWARD		0x000080
+#define OPT_WEIGHT		0x000100
+#define OPT_UTHRESHOLD		0x000200
+#define OPT_LTHRESHOLD		0x000400
+#define OPT_MCAST		0x000800
+#define OPT_TIMEOUT		0x001000
+#define OPT_DAEMON		0x002000
+#define OPT_STATS		0x004000
+#define OPT_RATE		0x008000
+#define OPT_THRESHOLDS		0x010000
+#define OPT_PERSISTENTCONN	0x020000
+#define OPT_SORT		0x040000
+#define OPT_SYNCID		0x080000
+#define OPT_QUIESCENT		0x100000
+#define OPT_OFFLINE		0x200000
+#define OPT_DESTFLAGS		0x400000
+#define NUMBER_OF_OPT		23
 
 static const char* optnames[] = {
 	"numeric",
@@ -205,6 +209,9 @@
 	"persistent-conn",
 	"sort",
 	"syncid",
+	"quiescent",
+	"offline",
+	"destflags",
 };
 
 /*
@@ -217,21 +224,21 @@
  */
 static const char commands_v_options[NUMBER_OF_CMD][NUMBER_OF_OPT] =
 {
-	/*   -n   -c   svc  -s   -p   -M   -r   fwd  -w   -x   -y   -mc  tot  dmn  -st  -rt  thr  -pc  srt  sid */
-/*ADD*/     {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' '},
-/*EDIT*/    {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*DEL*/     {'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*FLUSH*/   {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*LIST*/    {' ', '1', '1', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', '1', '1', ' ', ' ', ' ', ' ', ' ', 'x'},
-/*ADDSRV*/  {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*DELSRV*/  {'x', 'x', '+', 'x', 'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*EDITSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*TIMEOUT*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*STARTD*/  {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' '},
-/*STOPD*/   {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' '},
-/*RESTORE*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*SAVE*/    {' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
-/*ZERO*/    {'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+	/*   -n   -c   svc  -s   -p   -M   -r   fwd  -w   -x   -y   -mc  tot  dmn  -st  -rt  thr  -pc  srt  sid  qesc off  df */
+/*ADD*/     {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x'},
+/*EDIT*/    {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*DEL*/     {'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*FLUSH*/   {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*LIST*/    {' ', '1', '1', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', '1', '1', ' ', ' ', ' ', ' ', ' ', 'x', 'x', 'x', ' '},
+/*ADDSRV*/  {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', ' ', 'x'},
+/*DELSRV*/  {'x', 'x', '+', 'x', 'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*EDITSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', ' ', 'x'},
+/*TIMEOUT*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*STARTD*/  {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x'},
+/*STOPD*/   {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x'},
+/*RESTORE*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*SAVE*/    {' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
+/*ZERO*/    {'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
 };
 
 /* printing format flags */
@@ -243,6 +250,7 @@
 #define FMT_THRESHOLDS		0x0010
 #define FMT_PERSISTENTCONN	0x0020
 #define FMT_SORT		0x0040
+#define FMT_DESTFLAGS		0x0100
 
 #define SERVICE_NONE		0x0000
 #define SERVICE_ADDR		0x0001
@@ -256,6 +264,10 @@
 
 #define CONN_PROC_FILE		"/proc/net/ip_vs_conn"
 
+#define IDX_DESTFLAGS		129
+#define IDX_QUIESCENT		130
+#define IDX_OFFLINE		131
+
 struct ipvs_command_entry {
 	int			cmd;
 	ipvs_service_t		svc;
@@ -388,9 +400,14 @@
 		{"thresholds", '\0', POPT_ARG_NONE, NULL, '9'},
 		{"persistent-conn", '\0', POPT_ARG_NONE, NULL, 'P'},
 		{"sort", '\0', POPT_ARG_NONE, NULL, '0'},
+		{"quiescent", '\0', POPT_ARG_NONE, NULL, IDX_QUIESCENT},
+		{"offline", '\0', POPT_ARG_NONE, NULL, IDX_OFFLINE},
+		{"destflags", '\0', POPT_ARG_NONE, NULL, IDX_DESTFLAGS},
 		{NULL, 0, 0, NULL, 0}
 	};
 
+	ce->dest.conn_flags = 0;
+
 	context = poptGetContext("ipvsadm", argc, (const char **)argv,
 				 options_table, 0);
 
@@ -518,21 +535,23 @@
 			break;
 		case 'i':
 			set_option(options, OPT_FORWARD);
-			ce->dest.conn_flags = IP_VS_CONN_F_TUNNEL;
+			ce->dest.conn_flags |= IP_VS_CONN_F_TUNNEL;
 			break;
 		case 'g':
 			set_option(options, OPT_FORWARD);
-			ce->dest.conn_flags = IP_VS_CONN_F_DROUTE;
+			ce->dest.conn_flags |= IP_VS_CONN_F_DROUTE;
 			break;
 		case 'm':
 			set_option(options, OPT_FORWARD);
-			ce->dest.conn_flags = IP_VS_CONN_F_MASQ;
+			ce->dest.conn_flags |= IP_VS_CONN_F_MASQ;
 			break;
 		case 'w':
 			set_option(options, OPT_WEIGHT);
 			if ((ce->dest.weight =
 			     string_to_number(optarg, 0, 65535)) == -1)
 				fail(2, "illegal weight specified");
+			if (!ce->dest.weight)
+				ce->dest.conn_flags |= IP_VS_CONN_F_QUIESCENT;
 			break;
 		case 'x':
 			set_option(options, OPT_UTHRESHOLD);
@@ -590,6 +609,18 @@
 			set_option(options, OPT_SORT);
 			*format |= FMT_SORT;
 			break;
+		case IDX_DESTFLAGS:
+			set_option(options, OPT_DESTFLAGS);
+			*format |= FMT_DESTFLAGS;
+			break;
+		case IDX_QUIESCENT:
+			set_option(options, OPT_QUIESCENT);
+			ce->dest.conn_flags |= IP_VS_CONN_F_QUIESCENT;
+			break;
+		case IDX_OFFLINE:
+			set_option(options, OPT_OFFLINE);
+			ce->dest.conn_flags |= IP_VS_CONN_F_OFFLINE;
+			break;
 		default:
 			fail(2, "invalid option `%s'",
 			     poptBadOption(context, POPT_BADOPTION_NOALIAS));
@@ -678,6 +709,9 @@
 		{"thresholds", 0, 0, '9'},
 		{"persistent-conn", 0, 0, 'P'},
 		{"sort", 0, 0, '0'},
+		{"quiescent", 0, 0, IDX_QUIESCENT},
+		{"offline", 0, 0, IDX_OFFLINE},
+		{"destflags", 0, 0, IDX_DESTFLAGS},
 		{"help", 0, 0, 'h'},
 		{0, 0, 0, 0}
 	};
@@ -688,6 +722,8 @@
 
 	optind = 1;
 
+	ce->dest.conn_flags = 0;
+
 	if ((c = getopt_long(argc, argv, optstring,
 			     long_options, NULL)) == EOF)
 		tryhelp_exit(argv[0], -1);
@@ -830,21 +866,23 @@
 			break;
 		case 'i':
 			set_option(options, OPT_FORWARD);
-			ce->dest.conn_flags = IP_VS_CONN_F_TUNNEL;
+			ce->dest.conn_flags |= IP_VS_CONN_F_TUNNEL;
 			break;
 		case 'g':
 			set_option(options, OPT_FORWARD);
-			ce->dest.conn_flags = IP_VS_CONN_F_DROUTE;
+			ce->dest.conn_flags |= IP_VS_CONN_F_DROUTE;
 			break;
 		case 'm':
 			set_option(options, OPT_FORWARD);
-			ce->dest.conn_flags = IP_VS_CONN_F_MASQ;
+			ce->dest.conn_flags |= IP_VS_CONN_F_MASQ;
 			break;
 		case 'w':
 			set_option(options, OPT_WEIGHT);
 			if ((ce->dest.weight =
 			     string_to_number(optarg, 0, 65535)) == -1)
 				fail(2, "illegal weight specified");
+			if (!ce->dest.weight)
+				ce->dest.conn_flags |= IP_VS_CONN_F_QUIESCENT;
 			break;
 		case 'x':
 			set_option(options, OPT_UTHRESHOLD);
@@ -902,6 +940,18 @@
 			set_option(options, OPT_SORT);
 			*format |= FMT_SORT;
 			break;
+		case IDX_DESTFLAGS:
+			set_option(options, OPT_DESTFLAGS);
+			*format |= FMT_DESTFLAGS;
+			break;
+		case IDX_QUIESCENT:
+			set_option(options, OPT_QUIESCENT);
+			ce->dest.conn_flags |= IP_VS_CONN_F_QUIESCENT;
+			break;
+		case IDX_OFFLINE:
+			set_option(options, OPT_OFFLINE);
+			ce->dest.conn_flags |= IP_VS_CONN_F_OFFLINE;
+			break;
 		default:
 			fail(2, "invalid option `%s'", argv[optind-1]);
 		}
@@ -1318,6 +1368,8 @@
 		"  --weight       -w weight            capacity of real server\n"
 		"  --u-threshold  -x uthreshold        upper threshold of connections\n"
 		"  --l-threshold  -y lthreshold        lower threshold of connections\n"
+		"  --quiescent                         mark the destination as quiescent\n"
+		"  --offline                           mark the destination as offline\n"
 		"  --mcast-interface interface         multicast interface for connection sync\n"
 		"  --syncid sid                        syncid for connection sync (default=255)\n"
 		"  --connection   -c                   output of current IPVS connections\n"
@@ -1327,6 +1379,7 @@
 		"  --rate                              output of rate information\n"
 		"  --thresholds                        output of thresholds information\n"
 		"  --persistent-conn                   output of persistent connection info\n"
+		"  --destflags                         output of destination flags\n"
 		"  --sort                              sorting output of service/server entries\n"
 		"  --numeric      -n                   numeric output of addresses and ports\n",
 		DEF_SCHED);
@@ -1576,6 +1629,11 @@
 		       "  -> RemoteAddress:Port\n",
 		       "Prot LocalAddress:Port",
 		       "Weight", "PersistConn", "ActiveConn", "InActConn");
+	else if (format & FMT_DESTFLAGS)
+		printf("%-33s %-9s %-8s %-10s %-10s\n"
+		       "  -> RemoteAddress:Port\n",
+		       "Prot LocalAddress:Port",
+		       "Flags", "Weight", "ActiveConn", "InActConn");
 	else if (!(format & FMT_RULE))
 		printf("Prot LocalAddress:Port Scheduler Flags\n"
 		       "  -> RemoteAddress:Port           Forward Weight ActiveConn InActConn\n");
@@ -1673,8 +1731,12 @@
 			dname[28] = '\0';
 
 		if (format & FMT_RULE) {
-			printf("-a %s -r %s %s -w %d\n", svc_name, dname,
-			       fwd_switch(e->conn_flags), e->weight);
+			printf("-a %s -r %s %s -w %d%s%s\n", svc_name, dname,
+			       fwd_switch(e->conn_flags), e->weight,
+			       (e->conn_flags & IP_VS_CONN_F_QUIESCENT)?
+			       	" --quiescent":"",
+			       (e->conn_flags & IP_VS_CONN_F_OFFLINE)?
+			       	" --offline":"");
 		} else if (format & FMT_STATS) {
 			printf("  -> %-28s", dname);
 			print_largenum(e->stats.conns);
@@ -1695,6 +1757,13 @@
 			printf("  -> %-28s %-10u %-10u %-10u %-10u\n", dname,
 			       e->u_threshold, e->l_threshold,
 			       e->activeconns, e->inactconns);
+		} else if (format & FMT_DESTFLAGS) {
+			printf("  -> %-28s %c%c        %-9u %-10u %-10u\n", 
+			       dname,
+			       (e->conn_flags & IP_VS_CONN_F_QUIESCENT)?'Q':' ',
+			       (e->conn_flags & IP_VS_CONN_F_OFFLINE)?'O':' ',
+			       e->weight, 
+			       e->activeconns, e->inactconns);
 		} else if (format & FMT_PERSISTENTCONN) {
 			printf("  -> %-28s %-9u %-11u %-10u %-10u\n", dname,
 			       e->weight, e->persistconns,