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 /asn1/tetra | |
| parent | 94d35481b773e785c3aec31f81dea4300fdb5669 (diff) | |
| download | wireshark-4e1b5ea866dd332294246c4800efe77431010ad8.tar.gz | |
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 'asn1/tetra')
| -rw-r--r-- | asn1/tetra/packet-tetra-template.c | 40 | ||||
| -rw-r--r-- | asn1/tetra/tetra.cnf | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c index 1429b1a995..bea66a601d 100644 --- a/asn1/tetra/packet-tetra-template.c +++ b/asn1/tetra/packet-tetra-template.c @@ -233,29 +233,29 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre switch(channel_type) { case TETRA_CHAN_AACH: - dissect_AACH_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_AACH_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case TETRA_CHAN_SCH_F: p = tvb_get_guint8(pdu, 0); switch(p >> 6) { case 0: if (dir == TETRA_DOWNLINK) - dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree, NULL); else - dissect_MAC_DATA_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_DATA_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 1: /* MAC-FRAG or MAC-END */ if((p >> 5) == 3) { if (dir == TETRA_DOWNLINK) - dissect_MAC_END_DOWNLINK_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_END_DOWNLINK_PDU(pdu, pinfo, tetra_sub_tree, NULL); else - dissect_MAC_END_UPLINK_PDU(pdu, pinfo, tetra_sub_tree); + dissect_MAC_END_UPLINK_PDU(pdu, pinfo, tetra_sub_tree, NULL); } else - dissect_MAC_FRAG_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_FRAG_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 2: - dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; } break; @@ -263,16 +263,16 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre p = tvb_get_guint8(pdu, 0); switch(p >> 6) { case 0: - dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 1: /* MAC-FRAG or MAC-END */ if((p >> 5) == 3) - dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree, NULL); else - dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 2: - dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; } break; @@ -280,38 +280,38 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre p = tvb_get_guint8(pdu, 0); switch(p >> 7) { case 0: /* MAC-ACCESS */ - dissect_MAC_ACCESS_PDU(pdu, pinfo, tetra_sub_tree); + dissect_MAC_ACCESS_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 1: /* MAC-END-HU */ - dissect_MAC_END_HU_PDU(pdu, pinfo, tetra_sub_tree); + dissect_MAC_END_HU_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; } break; case TETRA_CHAN_BSCH: col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "BSCH"); - dissect_BSCH_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_BSCH_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case TETRA_CHAN_BNCH: col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "BNCH"); - dissect_BNCH_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_BNCH_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case TETRA_CHAN_STCH: p = tvb_get_guint8(pdu, 0); switch(p >> 6) { case 0: - dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 1: /* MAC-FRAG or MAC-END */ if((p >> 5) == 3) { if (dir == TETRA_DOWNLINK) - dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree, NULL); else - dissect_MAC_END_UP114_PDU(pdu, pinfo, tetra_sub_tree); + dissect_MAC_END_UP114_PDU(pdu, pinfo, tetra_sub_tree, NULL); } else - dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 2: - dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; } break; diff --git a/asn1/tetra/tetra.cnf b/asn1/tetra/tetra.cnf index 8c4aab8a48..c7b5cee4cd 100644 --- a/asn1/tetra/tetra.cnf +++ b/asn1/tetra/tetra.cnf @@ -54,7 +54,7 @@ CALLMODE #.END -#.PDU +#.PDU_NEW AACH MAC-FRAG MAC-FRAG120 |