Added the possibillity of Statistic pkg as well.

svn path=/trunk/; revision=19436

7 files changed, 35 insertions, 8 deletions

diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 40caf63fd3..b4597a804d 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -541,7 +541,7 @@ static const value_string cmd_type[] = {
     { 0, NULL }
 };
 
-h248_curr_info_t curr_info = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
+h248_curr_info_t curr_info = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
 static guint32 error_code;
 static h248_wildcard_t wild_term;
 
@@ -1771,6 +1771,7 @@ dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     curr_info.pkg = NULL;
     curr_info.evt = NULL;
     curr_info.sig = NULL;
+    curr_info.stat = NULL;
     curr_info.par = NULL;
 
     /* Check if it is actually a text based h248 encoding, which we call
diff --git a/asn1/h248/packet-h248-template.h b/asn1/h248/packet-h248-template.h
index bb96dc4b7b..1b25510f46 100644
--- a/asn1/h248/packet-h248-template.h
+++ b/asn1/h248/packet-h248-template.h
@@ -210,6 +210,13 @@ typedef struct _h248_pkg_evt_t {
 	h248_pkg_param_t* parameters;	
 } h248_pkg_evt_t;
 
+typedef struct _h248_pkg_stat_t {
+	guint32 id;
+	int* hfid;
+	gint* ett;
+	h248_pkg_param_t* parameters;	
+} h248_pkg_stat_t;
+
 typedef struct _h248_package_t {
 	guint32 id;
 	int* hfid;
@@ -218,6 +225,7 @@ typedef struct _h248_package_t {
 	h248_pkg_param_t* properties;
 	h248_pkg_sig_t* signals;
 	h248_pkg_evt_t* events;
+	h248_pkg_stat_t* statistics;
 } h248_package_t;
 
 struct _h248_curr_info_t {
@@ -229,6 +237,7 @@ struct _h248_curr_info_t {
 	h248_package_t* pkg;
 	h248_pkg_evt_t* evt;
 	h248_pkg_sig_t* sig;
+	h248_pkg_stat_t* stat;
 	h248_pkg_param_t* par;
 };
 
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 643a28b85f..6591d9b5d0 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -953,7 +953,7 @@ static const value_string cmd_type[] = {
     { 0, NULL }
 };
 
-h248_curr_info_t curr_info = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
+h248_curr_info_t curr_info = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
 static guint32 error_code;
 static h248_wildcard_t wild_term;
 
@@ -5886,6 +5886,7 @@ dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     curr_info.pkg = NULL;
     curr_info.evt = NULL;
     curr_info.sig = NULL;
+    curr_info.stat = NULL;
     curr_info.par = NULL;
 
     /* Check if it is actually a text based h248 encoding, which we call
@@ -7058,7 +7059,7 @@ void proto_register_h248(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-h248-hfarr.c ---*/
-#line 1890 "packet-h248-template.c"
+#line 1891 "packet-h248-template.c"
 
   { &hf_h248_ctx, { "Context", "h248.ctx", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
   { &hf_h248_ctx_term, { "Termination", "h248.ctx.term", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
@@ -7218,7 +7219,7 @@ void proto_register_h248(void) {
     &ett_h248_Value,
 
 /*--- End of included file: packet-h248-ettarr.c ---*/
-#line 1915 "packet-h248-template.c"
+#line 1916 "packet-h248-template.c"
   };
 
   module_t *h248_module;
diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h
index fd8355cec1..4f72939b84 100644
--- a/epan/dissectors/packet-h248.h
+++ b/epan/dissectors/packet-h248.h
@@ -218,6 +218,13 @@ typedef struct _h248_pkg_evt_t {
 	h248_pkg_param_t* parameters;	
 } h248_pkg_evt_t;
 
+typedef struct _h248_pkg_stat_t {
+	guint32 id;
+	int* hfid;
+	gint* ett;
+	h248_pkg_param_t* parameters;	
+} h248_pkg_stat_t;
+
 typedef struct _h248_package_t {
 	guint32 id;
 	int* hfid;
@@ -226,6 +233,7 @@ typedef struct _h248_package_t {
 	h248_pkg_param_t* properties;
 	h248_pkg_sig_t* signals;
 	h248_pkg_evt_t* events;
+	h248_pkg_stat_t* statistics;
 } h248_package_t;
 
 struct _h248_curr_info_t {
@@ -237,6 +245,7 @@ struct _h248_curr_info_t {
 	h248_package_t* pkg;
 	h248_pkg_evt_t* evt;
 	h248_pkg_sig_t* sig;
+	h248_pkg_stat_t* stat;
 	h248_pkg_param_t* par;
 };
 
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index 6675057556..853dae65ae 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.c
@@ -111,6 +111,7 @@ static h248_package_t h248_package_3GUP = {
 	&hf_h248_package_3GUP_parameters,
 	&ett_h248_package_3GUP,
 	h248_package_3GUP_properties,
+	NULL,

 	NULL,
 	NULL
 };
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index a04d7b4e81..0d432b0e2e 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -951,7 +951,8 @@ static h248_package_t h248_annexc_package = {
 	&hf_h248_pkg_annexc_parameters,
 	&ett_annexc,
 	h248_annexc_package_properties,
-	NULL,
+	NULL,

+	NULL,

 	NULL
 };
 
diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c
index a63921ea30..663c92062f 100644
--- a/epan/dissectors/packet-h248_annex_e.c
+++ b/epan/dissectors/packet-h248_annex_e.c
@@ -63,8 +63,9 @@ static h248_package_t h248_pkg_generic = {
 	&hf_h248_pkg_generic_params,
 	&ett_h248_pkg_generic,
 	NULL,
-	NULL,
-	h248_pkg_generic_cause_evts
+	NULL,

+	h248_pkg_generic_cause_evts,
+	NULL

 };
 
 
@@ -95,6 +96,8 @@ static h248_package_t h248_pkg_root = {
 	&ett_h248_pkg_root,
 	h248_pkg_root_properties,
 	NULL,
+	NULL,

+	NULL,

 	NULL
 };
 */
@@ -121,6 +124,7 @@ static h248_package_t h248_pkg_tonegen = {
 	&ett_h248_pkg_tonegen,
 	h248_pkg_root_properties,
 	NULL,
+	NULL,

 	NULL
 };
 */
@@ -159,7 +163,8 @@ static h248_package_t h248_pkg_tdmc = {
 	&ett_h248_pkg_tdmc,
 	h248_pkg_tdmc_props,
 	NULL,
-	NULL
+	NULL,

+	NULL

 };