[PATCH] IPROUTE: tc correct error message

[PATCH] IPROUTE: tc correct error message

[Marcela Maslanova]

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

This warning message was removed in change 
083a5f00a15f6506815b0da2be82e7be761c5cbc
In this patch is checked, whether warning should be printed. Output
of "tc filter <type> help" isn't spoiled after my change.
-- 
Marcela Mašláňová
BaseOS team Brno

[-- Attachment #2: 0001-tc-error-message-protocol-is-needed.patch --]
[-- Type: text/x-patch, Size: 1366 bytes --]

>From e007577ef506671896857808634f3326d69b5072 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= <mmaslano@redhat.com>
Date: Mon, 22 Sep 2008 15:41:04 +0200
Subject: [PATCH] tc error message: protocol is needed.
 This message was removed in change 083a5f00a15f6506815b0da2be82e7be761c5cbc
 but now it's checked, whether it should be print and don't spoil
 help messages.

---
 tc/tc_filter.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/tc/tc_filter.c b/tc/tc_filter.c
index 177446e..ce30dd9 100644
--- a/tc/tc_filter.c
+++ b/tc/tc_filter.c
@@ -120,7 +120,9 @@ int tc_filter_modify(int cmd, unsigned flags, int argc, char **argv)
 			if (parse_estimator(&argc, &argv, &est) < 0)
 				return -1;
 		} else if (matches(*argv, "help") == 0) {
+			protocol_set = 1;
 			usage();
+			return 0;
 		} else {
 			strncpy(k, *argv, sizeof(k)-1);
 
@@ -128,7 +130,6 @@ int tc_filter_modify(int cmd, unsigned flags, int argc, char **argv)
 			argc--; argv++;
 			break;
 		}
-
 		argc--; argv++;
 	}
 
@@ -153,6 +154,11 @@ int tc_filter_modify(int cmd, unsigned flags, int argc, char **argv)
 			return -1;
 		}
 	}
+	if (!protocol_set) {
+		fprintf(stderr, "\"protocol\" is required.\n");
+		return -1;
+	}
+
 	if (est.ewma_log)
 		addattr_l(&req.n, sizeof(req), TCA_RATE, &est, sizeof(est));
 
-- 
1.5.5.2

Re: [PATCH] IPROUTE: tc correct error message

[Stephen Hemminger]

This warning message was removed in change 
083a5f00a15f6506815b0da2be82e7be761c5cbc
In this patch is checked, whether warning should be printed. Output
of "tc filter <type> help" isn't spoiled after my change.
-- 


Actually, protocol is not required. It defaults to all.
But I did go ahead and make help just return.