Wireshark-commits: [Wireshark-commits] master 8eabc74: camel: Fix dissection of SpecializedResource

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 29 Mar 2019 04:49:19 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8eabc748cf6b031133144ff07ecccadb4926a56a
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

8eabc74 by Vasil Velichkov (vvvelichkov@xxxxxxxxx):

    camel: Fix dissection of SpecializedResourceReportArg
    
    The SpecializedResourceReportArg has a different and incompatible
    definition in CAMEL phase 4. In phase 2 and 3 it is defined as NULL and
    in phase 4 it is defined as CHOICE that contains two NULL fields.
    
    - Add missing CAMEL phase 3 and 4 Application Context Names.
    - Move the common code from dissect_camel_v[12] functions into
      dissect_camel_all and add dissect_camel_v[34] functions.
    - Remove application_context_version as it has never been used and
      the version is determined in dissect_camel_v[1234] functions.
    
    Change-Id: I43eea246889786421b22dcfb937708eee814b29e
    Reviewed-on: https://code.wireshark.org/review/32611
    Reviewed-by: Pascal Quantin <pascal@xxxxxxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  d916e07   coap: Add retransmission detection
     add  8eabc74   camel: Fix dissection of SpecializedResourceReportArg


Summary of changes:
 epan/dissectors/asn1/camel/CamelV2diff.asn         |   2 +
 epan/dissectors/asn1/camel/camel.cnf               |   6 +
 epan/dissectors/asn1/camel/packet-camel-template.c | 122 ++++++-----------
 epan/dissectors/packet-camel.c                     | 152 +++++++++------------
 4 files changed, 116 insertions(+), 166 deletions(-)