From Chris Maynard:

Fix display filter field problems
Correct the template files in the case of generated dissectors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22621 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 10 insertions, 34 deletions

diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index a26e53c6e7..b2653c96c3 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -57,10 +57,6 @@
 
 /* Initialize the protocol and registered fields */
 int proto_ansi_tcap = -1;
-static int hf_ansi_tcap_tag = -1;
-static int hf_ansi_tcap_length = -1;
-static int hf_ansi_tcap_data = -1;
-static int hf_ansi_tcap_tid = -1;
 
 int hf_ansi_tcapsrt_SessionId=-1;
 int hf_ansi_tcapsrt_Duplicate=-1;
@@ -124,7 +120,7 @@ static int hf_ansi_tcap_paramSequence = -1;       /* T_paramSequence */
 static int hf_ansi_tcap_paramSet = -1;            /* T_paramSet */
 
 /*--- End of included file: packet-ansi_tcap-hf.c ---*/
-#line 64 "packet-ansi_tcap-template.c"
+#line 60 "packet-ansi_tcap-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_tcap = -1;
@@ -167,7 +163,7 @@ static gint ett_ansi_tcap_T_paramSequence = -1;
 static gint ett_ansi_tcap_T_paramSet = -1;
 
 /*--- End of included file: packet-ansi_tcap-ett.c ---*/
-#line 80 "packet-ansi_tcap-template.c"
+#line 76 "packet-ansi_tcap-template.c"
 
 #define MAX_SSN 254
 static range_t *global_ssn_range;
@@ -1188,7 +1184,7 @@ dissect_ansi_tcap_PackageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 /*--- End of included file: packet-ansi_tcap-fn.c ---*/
-#line 190 "packet-ansi_tcap-template.c"
+#line 186 "packet-ansi_tcap-template.c"
 
 
 
@@ -1276,54 +1272,34 @@ proto_register_ansi_tcap(void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
     static hf_register_info hf[] = {
-	{ &hf_ansi_tcap_tag,
-		{ "Tag",           "tcap.msgtype",
-		FT_UINT8, BASE_HEX, NULL, 0,
-		"", HFILL }
-	},
-	{ &hf_ansi_tcap_length,
-		{ "Length", "tcap.len",
-		FT_UINT8, BASE_HEX, NULL, 0,
-		"", HFILL }
-	},
-	{ &hf_ansi_tcap_data,
-		{ "Data", "tcap.data",
-		FT_BYTES, BASE_HEX, NULL, 0,
-		"", HFILL }
-	},
-		{ &hf_ansi_tcap_tid,
-		{ "Transaction Id", "tcap.tid",
-		FT_BYTES, BASE_HEX, NULL, 0,
-		"", HFILL }
-	},
 	/* Tcap Service Response Time */
 	{ &hf_ansi_tcapsrt_SessionId,
 	  { "Session Id",
-	    "tcap.srt.session_id",
+	    "ansi_tcap.srt.session_id",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
 	    "", HFILL }
 	},
 	{ &hf_ansi_tcapsrt_BeginSession,
 	  { "Begin Session",
-	    "tcap.srt.begin",
+	    "ansi_tcap.srt.begin",
 	    FT_FRAMENUM, BASE_NONE, NULL, 0x0,
 	    "SRT Begin of Session", HFILL }
 	},
 	{ &hf_ansi_tcapsrt_EndSession,
 	  { "End Session",
-	    "tcap.srt.end",
+	    "ansi_tcap.srt.end",
 	    FT_FRAMENUM, BASE_NONE, NULL, 0x0,
 	    "SRT End of Session", HFILL }
 	},
 	{ &hf_ansi_tcapsrt_SessionTime,
 	  { "Session duration",
-	    "tcap.srt.sessiontime",
+	    "ansi_tcap.srt.sessiontime",
 	    FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
 	    "Duration of the TCAP session", HFILL }
 	},
 	{ &hf_ansi_tcapsrt_Duplicate,
 	  { "Request Duplicate",
-	    "tcap.srt.duplicate",
+	    "ansi_tcap.srt.duplicate",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
 	    "", HFILL }
 	},
@@ -1536,7 +1512,7 @@ proto_register_ansi_tcap(void)
         "ansi_tcap.T_paramSet", HFILL }},
 
 /*--- End of included file: packet-ansi_tcap-hfarr.c ---*/
-#line 329 "packet-ansi_tcap-template.c"
+#line 305 "packet-ansi_tcap-template.c"
     };
 
 /* Setup protocol subtree array */
@@ -1573,7 +1549,7 @@ proto_register_ansi_tcap(void)
     &ett_ansi_tcap_T_paramSet,
 
 /*--- End of included file: packet-ansi_tcap-ettarr.c ---*/
-#line 339 "packet-ansi_tcap-template.c"
+#line 315 "packet-ansi_tcap-template.c"
     };
 
     /*static enum_val_t tcap_options[] = {