Pubate Satienpoch keeps finding typos and incongruences in H.248 packages:

- for Q.1950 I used the value_string for GB events as the value_string for the parameters of BNC change.

> In observed event descriptor, it is called “eventName”, but in event descriptor,
> it is called “pkgdName”. It should be “eventName” in both cases.

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

diff --git a/asn1/h248/h248v3.asn b/asn1/h248/h248v3.asn
index 694494b413cfebcba496120eb883d91f91c70f6e..ecf7dc8af4151ffa8e843b6c1b1ad7e3c3dcb29c 100644 (file)
--- a/asn1/h248/h248v3.asn
+++ b/asn1/h248/h248v3.asn
@@ -774,7 +774,7 @@ BEGIN
        RequestedEvent ::= SEQUENCE
        {
 --             pkgdName                                [0] PkgdName,
-               pkgdName                                [0] EventName,
+               eventName                               [0] EventName,
                streamID                                [1] StreamID OPTIONAL,
                eventAction                             [2] RequestedActions OPTIONAL,
                evParList                               [3] SEQUENCE OF EventParameter,

diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 7d01bdfc16a4c0e99f21e097220df3f1fc69cb8c..18bd5cbcab057af0a4d738f4dd917612a22e27d2 100644 (file)
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -294,7 +294,6 @@ static int hf_h248_termList_item = -1;            /* TerminationID */
 static int hf_h248_nonStandardData = -1;          /* NonStandardData */
 static int hf_h248_eventList = -1;                /* SEQUENCE_OF_RequestedEvent */
 static int hf_h248_eventList_item = -1;           /* RequestedEvent */
-static int hf_h248_pkgdName = -1;                 /* EventName */
 static int hf_h248_eventAction = -1;              /* RequestedActions */
 static int hf_h248_evParList = -1;                /* SEQUENCE_OF_EventParameter */
 static int hf_h248_evParList_item = -1;           /* EventParameter */
@@ -309,7 +308,7 @@ static int hf_h248_resetEventsDescriptor = -1;    /* NULL */
 static int hf_h248_digitMapValue = -1;            /* DigitMapValue */
 static int hf_h248_secondaryEventList = -1;       /* SEQUENCE_OF_SecondRequestedEvent */
 static int hf_h248_secondaryEventList_item = -1;  /* SecondRequestedEvent */
-static int hf_h248_pkgdName1 = -1;                /* PkgdName */
+static int hf_h248_pkgdName = -1;                 /* PkgdName */
 static int hf_h248_secondaryEventAction = -1;     /* SecondRequestedActions */
 static int hf_h248_EventBufferDescriptor_item = -1;  /* EventSpec */
 static int hf_h248_SignalsDescriptor_item = -1;   /* SignalRequest */
@@ -2982,8 +2981,8 @@ static int dissect_iASignalName_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 static int dissect_iAStatName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
   return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_iAStatName);
 }
-static int dissect_pkgdName1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_pkgdName1);
+static int dissect_pkgdName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_h248_PkgdName(TRUE, tvb, offset, pinfo, tree, hf_h248_pkgdName);
 }
 
 
@@ -3966,9 +3965,6 @@ static int dissect_requestId_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
 static int dissect_eventName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
   return dissect_h248_EventName(TRUE, tvb, offset, pinfo, tree, hf_h248_eventName);
 }
-static int dissect_pkgdName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_h248_EventName(TRUE, tvb, offset, pinfo, tree, hf_h248_pkgdName);
-}
 
 
 
@@ -4457,7 +4453,7 @@ static int dissect_evParList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 
 static const ber_sequence_t SecondRequestedEvent_sequence[] = {
-  { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName1_impl },
+  { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_secondaryEventAction_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_evParList_impl },
@@ -4530,7 +4526,7 @@ static int dissect_eventAction_impl(packet_info *pinfo, proto_tree *tree, tvbuff
 
 
 static const ber_sequence_t RequestedEvent_sequence[] = {
-  { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl },
+  { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventAction_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_evParList_impl },
@@ -7440,10 +7436,6 @@ void proto_register_h248(void) {
       { "Item", "h248.eventList_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "h248.RequestedEvent", HFILL }},
-    { &hf_h248_pkgdName,
-      { "pkgdName", "h248.pkgdName",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "h248.EventName", HFILL }},
     { &hf_h248_eventAction,
       { "eventAction", "h248.eventAction",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -7500,7 +7492,7 @@ void proto_register_h248(void) {
       { "Item", "h248.eventList_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "h248.SecondRequestedEvent", HFILL }},
-    { &hf_h248_pkgdName1,
+    { &hf_h248_pkgdName,
       { "pkgdName", "h248.pkgdName",
         FT_BYTES, BASE_HEX, NULL, 0,
         "h248.PkgdName", HFILL }},

diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index ea52b4ef166e1ac4e19371636a95d825b3c650dd..201a6682d59704f43a9d549c26ed98f4ff591ec9 100644 (file)
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -195,13 +195,18 @@ static const value_string h248_pkg_GB_BNCChange_type_vals[] = {
        {0,NULL}
 };
 
+static const value_string h248_pkg_GB_BNCChange_params_vals[] = {
+       {0x01, "Type"},
+       {0,NULL}
+};
+
 static const h248_pkg_param_t h248_pkg_GB_BNCChange_pars[] = {
        { 0x0001, &hf_h248_pkg_GB_BNCChange_type, h248_param_ber_integer, &implicit },
        { 0, NULL, NULL, NULL}
 };
 
 static const h248_pkg_evt_t h248_pkg_GB_events[] = {
-       { 0x0001, &hf_h248_pkg_GB_BNCChange, &ett_h248_pkg_GB_BNCChange, h248_pkg_GB_BNCChange_pars, h248_pkg_GB_events_vals},
+       { 0x0001, &hf_h248_pkg_GB_BNCChange, &ett_h248_pkg_GB_BNCChange, h248_pkg_GB_BNCChange_pars, h248_pkg_GB_BNCChange_params_vals},
 };
 
 static const value_string h248_pkg_GB_signals_vals[] = {