Skip to contentSkip to conversation

Restore old output of u32

PATCH Applied jamal 2 participants 2 messages Apr 20, 2008 – May 9, 2008

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

jamal

author
#0 lore raw

PATCH 1/3 Restore old output of u32

This is a repeat of the first one i sent already..

cheers,
jamal

[PATCH 1/3] [TC/U32] Restore old output of u32
My scripts broke because of the new change that beautifies output. Restore old output as default and have user enter -cooked if they want beautified output...

Signed-off-by Jamal Hadi Salim <[email protected]>
---
 include/utils.h |    1 +
 tc/f_u32.c      |    2 +-
 tc/tc.c         |    3 +++
 3 files changed, 5 insertions(+), 1 deletions(-)
include/utils.h +1 -0
index 5daed6b..3a7312c 100644
@@ -13,6 +13,7 @@ extern int preferred_family;
 extern int show_stats;
 extern int show_details;
 extern int show_raw;
+extern int show_cooked;
 extern int resolve_hosts;
 extern int oneline;
 extern int timestamp;
tc/f_u32.c +1 -1
index 7e4d56c..db492fe 100644
@@ -793,7 +793,7 @@ static void show_key(FILE *f, const struct tc_u32_key *key)
 {
 	char abuf[256];
 
-	if (show_raw)
+	if (!show_cooked)
 		goto raw;
 
 	switch (key->off) {
tc/tc.c +3 -0
index 6126c71..06058fb 100644
@@ -33,6 +33,7 @@
 int show_stats = 0;
 int show_details = 0;
 int show_raw = 0;
+int show_cooked = 0;
 int resolve_hosts = 0;
 int use_iec = 0;
 int force = 0;

@@ -273,6 +274,8 @@ int main(int argc, char **argv)
 			++show_details;
 		} else if (matches(argv[1], "-raw") == 0) {
 			++show_raw;
+		} else if (matches(argv[1], "-cooked") == 0) {
+			++show_cooked;
 		} else if (matches(argv[1], "-Version") == 0) {
 			printf("tc utility, iproute2-ss%s\n", SNAPSHOT);
 			return 0;
Signature · 1 line
1.4.4.1.gaed4
Applied
#1 lore raw
Quoted 5 lines · On Sun, 20 Apr 2008 10:45:44 -0400 jamal <[email protected]> wrote:

This is a repeat of the first one i sent already..

cheers,
jamal

I applied these but I changed "-cooked" to "-pretty", just personal taste, cooked sounds too cute and leftover unix geeky.

Also, added documentation to the tc.8 man page for this.