Some custom column enhancements:

Use the value_string if defined for integer and boolean values.

svn path=/trunk/; revision=24418

1 files changed, 16 insertions, 2 deletions

diff --git a/epan/proto.c b/epan/proto.c
index 133d02fab5..651c2e1aad 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -2649,7 +2649,17 @@ proto_tree_set_uint(field_info *fi, guint32 value)
 		}
 	}
 
-	col_custom_set_fstr(hfinfo->abbrev, "%u", integer);
+	if (hfinfo->type == FT_BOOLEAN) {
+		const true_false_string  *tfstring = &tfs_true_false;
+		if (hfinfo->strings) {
+			tfstring = (const struct true_false_string*) hfinfo->strings;
+		}
+		col_custom_set_fstr(hfinfo->abbrev, "%s", value ? tfstring->true_string : tfstring->false_string);
+	} else if (hfinfo->strings) {
+		col_custom_set_fstr(hfinfo->abbrev, "%s", val_to_str(integer, cVALS(hfinfo->strings), "Unknown"));
+	} else {
+		col_custom_set_fstr(hfinfo->abbrev, "%d", integer);
+	}
 	fvalue_set_uinteger(&fi->value, integer);
 }
 
@@ -2815,7 +2825,11 @@ proto_tree_set_int(field_info *fi, gint32 value)
 		}
 	}
 
-	col_custom_set_fstr(hfinfo->abbrev, "%d", integer);
+	if (hfinfo->strings) {
+		col_custom_set_fstr(hfinfo->abbrev, "%s", val_to_str(integer, cVALS(hfinfo->strings), "Unknown"));
+	} else {
+		col_custom_set_fstr(hfinfo->abbrev, "%d", integer);
+	}
 	fvalue_set_sinteger(&fi->value, integer);
 }