diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-06 15:31:47 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-13 11:24:07 +0000 |
| commit | 4e1b5ea866dd332294246c4800efe77431010ad8 (patch) | |
| tree | 8cda568a450b29fd7bbfcbbf03d840ab9f123190 /epan/dissectors/packet-nbap.c | |
| parent | 94d35481b773e785c3aec31f81dea4300fdb5669 (diff) | |
ASN1: Register PDU-dissectors as NEW
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan/dissectors/packet-nbap.c')
| -rw-r--r-- | epan/dissectors/packet-nbap.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index cb3702a85a..cf3e651901 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -55152,10 +55152,13 @@ static int dissect_SecondaryULFrequencyUpdateIndication_PDU(tvbuff_t *tvb _U_, p offset += 7; offset >>= 3; return offset; } -static void dissect_NBAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_NBAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - dissect_nbap_NBAP_PDU(tvb, 0, &asn1_ctx, tree, hf_nbap_NBAP_PDU_PDU); + offset = dissect_nbap_NBAP_PDU(tvb, offset, &asn1_ctx, tree, hf_nbap_NBAP_PDU_PDU); + offset += 7; offset >>= 3; + return offset; } static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; @@ -55296,8 +55299,8 @@ static void nbap_init(void){ lchId_type_table[i+1] = *lch_contents[i]; } } -static void -dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *nbap_item = NULL; proto_tree *nbap_tree = NULL; @@ -55314,7 +55317,7 @@ dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nbap_hsdsch_channel_info[i].entity = hs; } - dissect_NBAP_PDU_PDU(tvb, pinfo, nbap_tree); + return dissect_NBAP_PDU_PDU(tvb, pinfo, nbap_tree, data); } /*--- proto_register_nbap -------------------------------------------*/ @@ -70163,7 +70166,7 @@ void proto_register_nbap(void) expert_register_field_array(expert_nbap, ei, array_length(ei)); /* Register dissector */ - register_dissector("nbap", dissect_nbap, proto_nbap); + new_register_dissector("nbap", dissect_nbap, proto_nbap); nbap_module = prefs_register_protocol(proto_nbap, NULL); |