Add a few more things to the h225 dissector that got lost.

Lost things left:
-h.450 stuff
-support for the h.323 conversations tap (It is currently broken.)

svn path=/trunk/; revision=13076

2 files changed, 16 insertions, 7 deletions

diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index b470299d03..46c3bce9dc 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h225.c                                                            */
+/* ./packet-h225.c                                                            */
 /* ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */
 
 /* Input file: packet-h225-template.c */
@@ -7186,9 +7186,12 @@ static const per_choice_t RegistrationRejectReason_choice[] = {
 
 static int
 dissect_h225_RegistrationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+  guint32 value;
+
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
                               ett_h225_RegistrationRejectReason, RegistrationRejectReason_choice, "RegistrationRejectReason",
-                              NULL);
+                              &value);
+  h225_pi.reason = value;
 
   return offset;
 }
@@ -7627,9 +7630,12 @@ static const per_choice_t AdmissionRejectReason_choice[] = {
 
 static int
 dissect_h225_AdmissionRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+  guint32 value;
+
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
                               ett_h225_AdmissionRejectReason, AdmissionRejectReason_choice, "AdmissionRejectReason",
-                              NULL);
+                              &value);
+  h225_pi.reason = value;
 
   return offset;
 }
@@ -8052,9 +8058,12 @@ static const per_choice_t LocationRejectReason_choice[] = {
 
 static int
 dissect_h225_LocationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+  guint32 value;
+
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
                               ett_h225_LocationRejectReason, LocationRejectReason_choice, "LocationRejectReason",
-                              NULL);
+                              &value);
+  h225_pi.reason = value;
 
   return offset;
 }
diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h
index 720525e0e5..bbcae4b87d 100644
--- a/epan/dissectors/packet-h225.h
+++ b/epan/dissectors/packet-h225.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h225.h                                                            */
+/* ./packet-h225.h                                                            */
 /* ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */
 
 /* Input file: packet-h225-template.h */
@@ -73,7 +73,7 @@ typedef struct _h225_packet_info {
 
 
 
-/*--- Included file: packet-H225-exp.h ---*/
+/*--- Included file: packet-h225-exp.h ---*/
 
 ETH_VAR_IMPORT const value_string T_h323_message_body_vals[];
 ETH_VAR_IMPORT const value_string ReleaseCompleteReason_vals[];
@@ -100,7 +100,7 @@ int dissect_h225_AliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 int dissect_h225_PartyNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_h225_RasMessage(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
-/*--- End of included file: packet-H225-exp.h ---*/
+/*--- End of included file: packet-h225-exp.h ---*/
 
 
 #endif  /* PACKET_H225_H */