Add a "-G ftypes" option, which dumps our supprted FT_… names and

descriptions. Captitalize and fix up the descriptions. Use its output to
create the field type list in the wireshark-filter man page.

svn path=/trunk/; revision=40306

10 files changed, 48 insertions, 25 deletions

diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index ad9fff5efb..b6729d5728 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -463,7 +463,7 @@ ftype_register_bytes(void)
 	static ftype_t bytes_type = {
 		FT_BYTES,			/* ftype */
 		"FT_BYTES",			/* name */
-		"sequence of bytes",		/* pretty_name */
+		"Sequence of bytes",		/* pretty_name */
 		0,				/* wire_size */
 		bytes_fvalue_new,		/* new_value */
 		bytes_fvalue_free,		/* free_value */
@@ -501,7 +501,7 @@ ftype_register_bytes(void)
 	static ftype_t uint_bytes_type = {
 		FT_UINT_BYTES,		/* ftype */
 		"FT_UINT_BYTES",		/* name */
-		"sequence of bytes",		/* pretty_name */
+		"Sequence of bytes",		/* pretty_name */
 		0,				/* wire_size */
 		bytes_fvalue_new,		/* new_value */
 		bytes_fvalue_free,		/* free_value */
@@ -577,7 +577,7 @@ ftype_register_bytes(void)
 	static ftype_t oid_type = {
 		FT_OID,			/* ftype */
 		"FT_OID",			/* name */
-		"OBJECT IDENTIFIER",			/* pretty_name */
+		"ASN.1 object identifier",	/* pretty_name */
 		0,			/* wire_size */
 		bytes_fvalue_new,		/* new_value */
 		bytes_fvalue_free,		/* free_value */
diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index 537a1b27fe..b38597979c 100644
--- a/epan/ftypes/ftype-double.c
+++ b/epan/ftypes/ftype-double.c
@@ -159,7 +159,7 @@ ftype_register_double(void)
 	static ftype_t float_type = {
 		FT_FLOAT,			/* ftype */
 		"FT_FLOAT",			/* name */
-		"floating point (single-precision)", /* pretty_name */
+		"Floating point (single-precision)", /* pretty_name */
 		0,				/* wire_size */
 		double_fvalue_new,		/* new_value */
 		NULL,				/* free_value */
@@ -197,7 +197,7 @@ ftype_register_double(void)
 	static ftype_t double_type = {
 		FT_DOUBLE,			/* ftype */
 		"FT_DOUBLE",			/* name */
-		"floating point (double-precision)", /* pretty_name */
+		"Floating point (double-precision)", /* pretty_name */
 		0,				/* wire_size */
 		double_fvalue_new,		/* new_value */
 		NULL,				/* free_value */
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index e19890eed5..bf35aaf569 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -641,7 +641,7 @@ eui64_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, char *buf)
   	/* Copy and convert the address to network byte order. */
   	*(guint64 *)(void *)(p_eui64) = pntoh64(&(fv->value.integer64));
 
-	g_snprintf(buf, EUI64_STR_LEN, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", 
+	g_snprintf(buf, EUI64_STR_LEN, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
 	p_eui64[0], p_eui64[1], p_eui64[2], p_eui64[3],
 	p_eui64[4], p_eui64[5], p_eui64[6], p_eui64[7] );
 }
@@ -653,7 +653,7 @@ ftype_register_integers(void)
 	static ftype_t uint8_type = {
 		FT_UINT8,			/* ftype */
 		"FT_UINT8",			/* name */
-		"unsigned, 1 byte",		/* pretty name */
+		"Unsigned integer, 1 byte",	/* pretty name */
 		1,				/* wire_size */
 		int_fvalue_new,			/* new_value */
 		NULL,				/* free_value */
@@ -690,7 +690,7 @@ ftype_register_integers(void)
 	static ftype_t uint16_type = {
 		FT_UINT16,			/* ftype */
 		"FT_UINT16",			/* name */
-		"unsigned, 2 bytes",		/* pretty_name */
+		"Unsigned integer, 2 bytes",	/* pretty_name */
 		2,				/* wire_size */
 		int_fvalue_new,			/* new_value */
 		NULL,				/* free_value */
@@ -727,7 +727,7 @@ ftype_register_integers(void)
 	static ftype_t uint24_type = {
 		FT_UINT24,			/* ftype */
 		"FT_UINT24",			/* name */
-		"unsigned, 3 bytes",		/* pretty_name */
+		"Unsigned integer, 3 bytes",	/* pretty_name */
 		3,				/* wire_size */
 		int_fvalue_new,			/* new_value */
 		NULL,				/* free_value */
@@ -764,7 +764,7 @@ ftype_register_integers(void)
 	static ftype_t uint32_type = {
 		FT_UINT32,			/* ftype */
 		"FT_UINT32",			/* name */
-		"unsigned, 4 bytes",		/* pretty_name */
+		"Unsigned integer, 4 bytes",	/* pretty_name */
 		4,				/* wire_size */
 		int_fvalue_new,			/* new_value */
 		NULL,				/* free_value */
@@ -801,7 +801,7 @@ ftype_register_integers(void)
 	static ftype_t uint64_type = {
 		FT_UINT64,			/* ftype */
 		"FT_UINT64",			/* name */
-		"unsigned, 8 bytes",		/* pretty_name */
+		"Unsigned integer, 8 bytes",	/* pretty_name */
 		8,				/* wire_size */
 		int64_fvalue_new,		/* new_value */
 		NULL,				/* free_value */
@@ -838,7 +838,7 @@ ftype_register_integers(void)
 	static ftype_t int8_type = {
 		FT_INT8,			/* ftype */
 		"FT_INT8",			/* name */
-		"signed, 1 byte",		/* pretty_name */
+		"Signed integer, 1 byte",	/* pretty_name */
 		1,				/* wire_size */
 		int_fvalue_new,			/* new_value */
 		NULL,				/* free_value */
@@ -875,7 +875,7 @@ ftype_register_integers(void)
 	static ftype_t int16_type = {
 		FT_INT16,			/* ftype */
 		"FT_INT16",			/* name */
-		"signed, 2 bytes",		/* pretty_name */
+		"Signed integer, 2 bytes",	/* pretty_name */
 		2,				/* wire_size */
 		int_fvalue_new,			/* new_value */
 		NULL,				/* free_value */
@@ -912,7 +912,7 @@ ftype_register_integers(void)
 	static ftype_t int24_type = {
 		FT_INT24,			/* ftype */
 		"FT_INT24",			/* name */
-		"signed, 3 bytes",		/* pretty_name */
+		"Signed integer, 3 bytes",	/* pretty_name */
 		3,				/* wire_size */
 		int_fvalue_new,			/* new_value */
 		NULL,				/* free_value */
@@ -949,7 +949,7 @@ ftype_register_integers(void)
 	static ftype_t int32_type = {
 		FT_INT32,			/* ftype */
 		"FT_INT32",			/* name */
-		"signed, 4 bytes",		/* pretty_name */
+		"Signed integer, 4 bytes",	/* pretty_name */
 		4,				/* wire_size */
 		int_fvalue_new,			/* new_value */
 		NULL,				/* free_value */
@@ -986,7 +986,7 @@ ftype_register_integers(void)
 	static ftype_t int64_type = {
 		FT_INT64,			/* ftype */
 		"FT_INT64",			/* name */
-		"signed, 8 bytes",		/* pretty_name */
+		"Signed integer, 8 bytes",	/* pretty_name */
 		8,				/* wire_size */
 		int64_fvalue_new,		/* new_value */
 		NULL,				/* free_value */
@@ -1099,7 +1099,7 @@ ftype_register_integers(void)
 	static ftype_t framenum_type = {
 		FT_FRAMENUM,			/* ftype */
 		"FT_FRAMENUM",			/* name */
-		"frame number",			/* pretty_name */
+		"Frame number",			/* pretty_name */
 		4,				/* wire_size */
 		int_fvalue_new,			/* new_value */
 		NULL,				/* free_value */
@@ -1171,7 +1171,7 @@ ftype_register_integers(void)
 		NULL,
 		NULL,
 	};
-	
+
 	ftype_register(FT_UINT8, &uint8_type);
 	ftype_register(FT_UINT16, &uint16_type);
 	ftype_register(FT_UINT24, &uint24_type);
diff --git a/epan/ftypes/ftype-none.c b/epan/ftypes/ftype-none.c
index 1428a1ba53..5daa85adb2 100644
--- a/epan/ftypes/ftype-none.c
+++ b/epan/ftypes/ftype-none.c
@@ -34,7 +34,7 @@ ftype_register_none(void)
 	static ftype_t none_type = {
 		FT_NONE,			/* ftype */
 		"FT_NONE",			/* name */
-		"label",			/* pretty_name */
+		"Label",			/* pretty_name */
 		0,				/* wire_size */
 		NULL,				/* new_value */
 		NULL,				/* free_value */
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index 3b9aaf30af..01a01b9fd7 100644
--- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c
@@ -281,7 +281,7 @@ ftype_register_string(void)
 	static ftype_t string_type = {
 		FT_STRING,			/* ftype */
 		"FT_STRING",			/* name */
-		"character string",		/* pretty_name */
+		"Character string",		/* pretty_name */
 		0,				/* wire_size */
 		string_fvalue_new,		/* new_value */
 		string_fvalue_free,		/* free_value */
@@ -318,7 +318,7 @@ ftype_register_string(void)
 	static ftype_t stringz_type = {
 		FT_STRINGZ,			/* ftype */
 		"FT_STRINGZ",			/* name */
-		"character string",		/* pretty name */
+		"Character string",		/* pretty name */
 		0,				/* wire_size */
 		string_fvalue_new,		/* new_value */
 		string_fvalue_free,		/* free_value */
@@ -355,7 +355,7 @@ ftype_register_string(void)
 	static ftype_t uint_string_type = {
 		FT_UINT_STRING,		/* ftype */
 		"FT_UINT_STRING",		/* name */
-		"character string",		/* pretty_name */
+		"Character string",		/* pretty_name */
 		0,				/* wire_size */
 		string_fvalue_new,		/* new_value */
 		string_fvalue_free,		/* free_value */
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 4e2f10fd5c..4f42ca2338 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -365,7 +365,7 @@ ftype_register_time(void)
 	static ftype_t abstime_type = {
 		FT_ABSOLUTE_TIME,		/* ftype */
 		"FT_ABSOLUTE_TIME",		/* name */
-		"date/time",			/* pretty_name */
+		"Date and time",		/* pretty_name */
 		0,				/* wire_size */
 		time_fvalue_new,		/* new_value */
 		NULL,				/* free_value */
@@ -402,7 +402,7 @@ ftype_register_time(void)
 	static ftype_t reltime_type = {
 		FT_RELATIVE_TIME,		/* ftype */
 		"FT_RELATIVE_TIME",		/* name */
-		"time offset",			/* pretty_name */
+		"Time offset",			/* pretty_name */
 		0,				/* wire_size */
 		time_fvalue_new,		/* new_value */
 		NULL,				/* free_value */
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index 66f49bdfe6..380ce16fb4 100644
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -422,7 +422,7 @@ ftype_register_tvbuff(void)
 	static ftype_t protocol_type = {
 		FT_PROTOCOL,			/* ftype */
 		"FT_PROTOCOL",			/* name */
-		"protocol",			/* pretty_name */
+		"Protocol",			/* pretty_name */
 		0,				/* wire_size */
 		value_new,			/* new_value */
 		value_free,			/* free_value */
diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index 3ccddb8ca0..82258be50a 100644
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -786,6 +786,7 @@ proto_register_subtree_array
 proto_registrar_dump_protocols
 proto_registrar_dump_values
 proto_registrar_dump_fields
+proto_registrar_dump_ftypes
 proto_registrar_get_ftype
 proto_registrar_get_byname
 proto_registrar_get_nth
diff --git a/epan/proto.c b/epan/proto.c
index 72e2b3ac80..6ccac1de57 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -6635,6 +6635,25 @@ proto_registrar_dump_fields(const int format)
 	}
 }
 
+/* Dumps field types and descriptive names to stdout. An independent
+ * program can take this output and format it into nice tables or HTML or
+ * whatever.
+ *
+ * There is one record per line. The fields are tab-delimited.
+ *
+ * Field 1 = field type name, e.g. FT_UINT8
+ * Field 2 = descriptive name, e.g. "Unsigned, 1 byte"
+ */
+void
+proto_registrar_dump_ftypes(void)
+{
+	ftenum_t fte;
+
+	for (fte = 0; fte < FT_NUM_TYPES; fte++) {
+		printf("%s\t%s\n", ftype_name(fte), ftype_pretty_name(fte));
+	}
+}
+
 static const char *
 hfinfo_numeric_format(const header_field_info *hfinfo)
 {
diff --git a/epan/proto.h b/epan/proto.h
index 3d88e0ccf6..6859d4829b 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1774,6 +1774,9 @@ extern void proto_registrar_dump_values(void);
  * and the blurb. */
 extern void proto_registrar_dump_fields(const int format);
 
+/** Dumps a glossary field types and descriptive names to STDOUT */
+extern void proto_registrar_dump_ftypes(void);
+
 
 
 /** Points to the first element of an array of Booleans, indexed by