diff options
| author | Michaël Bouchaud <michael.bouchaud@external.thalesaleniaspace.com> | 2015-02-11 18:38:23 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-07-01 04:15:28 +0000 |
| commit | 4b40c28a0e1fef19c5ac7ea512beb7519e0003ad (patch) | |
| tree | 1f695f0e34be872fcb99357a27d3032063d1c863 /epan | |
| parent | 40f3c393c3e5bf257a40d6b217ea5999746ccf14 (diff) | |
DVB-RCS: Dissect NCR in DVB-S2 dissector
DVB-RCS specifies an NCR (Network Clock Reference) which can be included
in the GSE stream and used to synchronize the return channel.
Change-Id: Ie9c99c8964e44245258a4a446755b2c59379088f
Reviewed-on: https://code.wireshark.org/review/37584
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dvb-s2-bb.c | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c index 9571e4972f..a2e0275fc1 100644 --- a/epan/dissectors/packet-dvb-s2-bb.c +++ b/epan/dissectors/packet-dvb-s2-bb.c @@ -8,6 +8,7 @@ * ETSI TS 102 606 - Digital Video Broadcasting (DVB) - Generic Stream Encapsulation (GSE) Protocol * ETSI TS 102 771 - Digital Video Broadcasting (DVB) - GSE implementation guidelines * SatLabs sl_561 - Mode Adaptation Interfaces for DVB-S2 equipment + * ETSI EN 301 545 - Digital Video Broadcasting (DVB) - Second Generation DVB Interactive Satellite System (DVB-RCS2) * * Copyright 2012, Tobias Rutz <tobias.rutz@work-microwave.de> * @@ -115,6 +116,7 @@ static int hf_dvb_s2_gse_label3 = -1; static int hf_dvb_s2_gse_fragid = -1; static int hf_dvb_s2_gse_totlength = -1; static int hf_dvb_s2_gse_exthdr = -1; +static int hf_dvb_s2_gse_ncr = -1; static int hf_dvb_s2_gse_data = -1; static int hf_dvb_s2_gse_crc32 = -1; @@ -127,6 +129,7 @@ static gint ett_dvb_s2_bb_matype1 = -1; static gint ett_dvb_s2_gse = -1; static gint ett_dvb_s2_gse_hdr = -1; +static gint ett_dvb_s2_gse_ncr = -1; static expert_field ei_dvb_s2_bb_crc = EI_INIT; static expert_field ei_dvb_s2_bb_header_ambiguous = EI_INIT; @@ -548,8 +551,11 @@ static const value_string gse_labeltype[] = { #define DVB_S2_GSE_HDR_LENGTH_MASK 0x0FFF +#define DVB_RCS2_NCR 0x0081 + static const range_string gse_proto_str[] = { {0x0000 , 0x00FF , "not implemented"}, + {DVB_RCS2_NCR , DVB_RCS2_NCR , "NCR" }, {0x0100 , 0x05FF , "not implemented"}, {0x0600 , 0x07FF , "not implemented"}, {ETHERTYPE_IP , ETHERTYPE_IP , "IPv4 Payload" }, @@ -582,7 +588,8 @@ static int dissect_dvb_s2_gse(tvbuff_t *tvb, int cur_off, proto_tree *tree, pack guint16 gse_hdr, data_len, padding_len, gse_proto = 0; proto_item *ti; - proto_tree *dvb_s2_gse_tree; + proto_item *ttf; + proto_tree *dvb_s2_gse_tree, *dvb_s2_gse_ncr_tree; tvbuff_t *next_tvb; @@ -708,8 +715,16 @@ static int dissect_dvb_s2_gse(tvbuff_t *tvb, int cur_off, proto_tree *tree, pack } else data_len = (gse_hdr & DVB_S2_GSE_HDR_LENGTH_MASK) - (new_off - DVB_S2_GSE_MINSIZE); - proto_tree_add_item(dvb_s2_gse_tree, hf_dvb_s2_gse_data, tvb, cur_off + new_off, data_len, ENC_NA); - new_off += data_len; + if (gse_proto == DVB_RCS2_NCR) { + ttf = proto_tree_add_item(dvb_s2_gse_tree, hf_dvb_s2_gse_ncr, tvb, cur_off + new_off, data_len, ENC_NA); + dvb_s2_gse_ncr_tree = proto_item_add_subtree(ttf, ett_dvb_s2_gse_ncr); + proto_tree_add_item(dvb_s2_gse_ncr_tree, hf_dvb_s2_gse_data, tvb, cur_off + new_off, data_len, ENC_NA); + new_off += data_len; + } + else { + proto_tree_add_item(dvb_s2_gse_tree, hf_dvb_s2_gse_data, tvb, cur_off + new_off, data_len, ENC_NA); + new_off += data_len; + } } /* add crc32 if last fragment */ @@ -1177,6 +1192,11 @@ void proto_register_dvb_s2_modeadapt(void) FT_UINT8, BASE_HEX, NULL, 0x0, "optional Extension Header", HFILL} }, + {&hf_dvb_s2_gse_ncr, { + "NCR Packet", "dvb-s2_gse.ncr", + FT_BYTES, BASE_NONE, NULL, 0x0, + "GSE NCR PAcket", HFILL} + }, {&hf_dvb_s2_gse_data, { "PDU Data", "dvb-s2_gse.data", FT_BYTES, BASE_NONE, NULL, 0x0, @@ -1191,7 +1211,8 @@ void proto_register_dvb_s2_modeadapt(void) static gint *ett_gse[] = { &ett_dvb_s2_gse, - &ett_dvb_s2_gse_hdr + &ett_dvb_s2_gse_hdr, + &ett_dvb_s2_gse_ncr }; static ei_register_info ei[] = { |