diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-02-25 15:42:35 -0500 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-02-25 20:46:49 +0000 |
commit | 11b5c15fdb815a2af400bfddef944dbac41a434a (patch) | |
tree | e7217ebcff4d4d9f7f95d0342b6776547e5537c3 /plugins/docsis | |
parent | c55c57ad72acda8cbce2841bc237f966bad5ae5b (diff) | |
download | wireshark-11b5c15fdb815a2af400bfddef944dbac41a434a.tar.gz |
Remove trailing whitespace
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0
Reviewed-on: https://code.wireshark.org/review/385
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'plugins/docsis')
-rw-r--r-- | plugins/docsis/packet-dccack.c | 4 | ||||
-rw-r--r-- | plugins/docsis/packet-dccreq.c | 58 | ||||
-rw-r--r-- | plugins/docsis/packet-dccrsp.c | 26 | ||||
-rw-r--r-- | plugins/docsis/packet-dcd.c | 168 | ||||
-rw-r--r-- | plugins/docsis/packet-dpvreq.c | 20 | ||||
-rw-r--r-- | plugins/docsis/packet-dpvrsp.c | 20 | ||||
-rw-r--r-- | plugins/docsis/packet-mdd.c | 2 | ||||
-rw-r--r-- | plugins/docsis/packet-regreqmp.c | 4 | ||||
-rw-r--r-- | plugins/docsis/packet-regrspmp.c | 20 | ||||
-rw-r--r-- | plugins/docsis/packet-tlv.c | 2 | ||||
-rw-r--r-- | plugins/docsis/packet-type29ucd.c | 4 | ||||
-rw-r--r-- | plugins/docsis/packet-ucd.c | 28 |
12 files changed, 178 insertions, 178 deletions
diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c index 64bfd32443..95f17d5370 100644 --- a/plugins/docsis/packet-dccack.c +++ b/plugins/docsis/packet-dccack.c @@ -117,10 +117,10 @@ proto_register_docsis_dccack (void) static hf_register_info hf[] = { {&hf_docsis_dccack_tran_id , { - "Transaction ID", + "Transaction ID", "docsis_dccack.tran_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c index e2900fbff4..2fc800956e 100644 --- a/plugins/docsis/packet-dccreq.c +++ b/plugins/docsis/packet-dccreq.c @@ -122,12 +122,12 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 pos = start; dcc_item = proto_tree_add_text ( tree, tvb, start, len, "2 DCC-REQ Downstream Params Encodings (Length = %u)", len); dcc_tree = proto_item_add_subtree ( dcc_item , ett_docsis_dccreq_ds_params); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCCREQ_DS_FREQ: @@ -147,7 +147,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_mod_type, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -158,7 +158,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_sym_rate, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -171,7 +171,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_intlv_depth_j, tvb, pos + 1, 1, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -182,7 +182,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_chan_id, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -203,16 +203,16 @@ dissect_dccreq_sf_sub (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len proto_item *dcc_item; proto_tree *dcc_tree; int pos; - + pos = start; dcc_item = proto_tree_add_text ( tree, tvb, start, len, "7 DCC-REQ Service Flow Substitution Encodings (Length = %u)", len); dcc_tree = proto_item_add_subtree ( dcc_item , ett_docsis_dccreq_sf_sub); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCCREQ_SF_SFID: @@ -384,64 +384,64 @@ proto_register_docsis_dccreq (void) static hf_register_info hf[] = { {&hf_docsis_dccreq_tran_id , { - "Transaction ID", + "Transaction ID", "docsis_dccreq.tran_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_up_chan_id , { - "Up Channel ID", + "Up Channel ID", "docsis_dccreq.up_chan_id", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_freq , { - "Frequency", + "Frequency", "docsis_dccreq.ds_freq", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_mod_type , { - "Modulation Type", + "Modulation Type", "docsis_dccreq.ds_mod_type", FT_UINT8, BASE_DEC, VALS (ds_mod_type_vals), 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_sym_rate , { - "Symbol Rate", + "Symbol Rate", "docsis_dccreq.ds_sym_rate", FT_UINT8, BASE_DEC, VALS (ds_sym_rate_vals), 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_intlv_depth_i , { - "Interleaver Depth I Value", + "Interleaver Depth I Value", "docsis_dccreq.ds_intlv_depth_i", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_intlv_depth_j , { - "Interleaver Depth J Value", + "Interleaver Depth J Value", "docsis_dccreq.ds_intlv_depth_j", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, @@ -465,19 +465,19 @@ proto_register_docsis_dccreq (void) }, {&hf_docsis_dccreq_init_tech , { - "Initialization Technique", + "Initialization Technique", "docsis_dccreq.init_tech", FT_UINT8, BASE_DEC, VALS (init_tech_vals), 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ucd_sub , { - "UCD Substitution", + "UCD Substitution", "docsis_dccreq.ucd_sub", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c index 90cc8d46f4..5af91e2143 100644 --- a/plugins/docsis/packet-dccrsp.c +++ b/plugins/docsis/packet-dccrsp.c @@ -64,16 +64,16 @@ dissect_dccrsp_cm_jump_time (tvbuff_t * tvb, proto_tree * tree, int start, guint proto_item *dcc_item; proto_tree *dcc_tree; int pos; - + pos = start; dcc_item = proto_tree_add_text ( tree, tvb, start, len, "2 DCC-RSP CM Time Jump Encodings (Length = %u)", len); dcc_tree = proto_item_add_subtree ( dcc_item , ett_docsis_dccrsp_cm_jump_time); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCCRSP_CM_JUMP_TIME_LENGTH: @@ -93,7 +93,7 @@ dissect_dccrsp_cm_jump_time (tvbuff_t * tvb, proto_tree * tree, int start, guint proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_cm_jump_time_start, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -177,37 +177,37 @@ proto_register_docsis_dccrsp (void) static hf_register_info hf[] = { {&hf_docsis_dccrsp_tran_id , { - "Transaction ID", + "Transaction ID", "docsis_dccrsp.tran_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccrsp_conf_code , { - "Confirmation Code", + "Confirmation Code", "docsis_dccrsp.conf_code", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccrsp_cm_jump_time_length , { - "Jump Time Length", + "Jump Time Length", "docsis_dccrsp.cm_jump_time_length", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccrsp_cm_jump_time_start , { - "Jump Time Start", + "Jump Time Start", "docsis_dccrsp.cm_jump_time_start", FT_UINT64, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c index 8369253bf9..14669d3b46 100644 --- a/plugins/docsis/packet-dcd.c +++ b/plugins/docsis/packet-dcd.c @@ -134,16 +134,16 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "51 DCD DSG Config Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_cfg); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_CFG_CHAN_LST: @@ -163,7 +163,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg1, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -174,7 +174,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg2, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -185,7 +185,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg3, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -196,7 +196,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg4, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -217,16 +217,16 @@ dissect_dcd_down_classifier_ip (tvbuff_t * tvb, proto_tree * tree, int start, gu proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "23.9 DCD_CFR_IP Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_cfr_ip); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_CFR_IP_SOURCE_ADDR: @@ -328,16 +328,16 @@ dissect_dcd_clid (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "50.4 DCD Rule ClientID Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_clid); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_CLID_BCAST_ID: @@ -394,16 +394,16 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "50 DCD DSG Rule Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_rule); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_RULE_ID: @@ -423,7 +423,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_pri, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -441,7 +441,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_tunl_addr, tvb, pos, length, ENC_NA); } - else + else { THROW (ReportedBoundsError); } @@ -452,7 +452,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_cfr_id, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -473,16 +473,16 @@ dissect_dcd_down_classifier (tvbuff_t * tvb, proto_tree * tree, int start, guint proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "23 DCD_CFR Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_cfr); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_CFR_ID: @@ -502,7 +502,7 @@ dissect_dcd_down_classifier (tvbuff_t * tvb, proto_tree * tree, int start, guint proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfr_rule_pri, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -575,145 +575,145 @@ proto_register_docsis_dcd (void) static hf_register_info hf[] = { {&hf_docsis_dcd_config_ch_cnt, { - "Configuration Change Count", + "Configuration Change Count", "docsis_dcd.config_ch_cnt", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_num_of_frag, { - "Number of Fragments", + "Number of Fragments", "docsis_dcd.num_of_frag", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_frag_sequence_num, { - "Fragment Sequence Number", + "Fragment Sequence Number", "docsis_dcd.frag_sequence_num", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_id, { - "Downstream Classifier Id", + "Downstream Classifier Id", "docsis_dcd.cfr_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_rule_pri, { - "Downstream Classifier Rule Priority", + "Downstream Classifier Rule Priority", "docsis_dcd.cfr_rule_pri", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_ip_source_addr, { - "Downstream Classifier IP Source Address", + "Downstream Classifier IP Source Address", "docsis_dcd.cfr_ip_source_addr", FT_IPv4, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_ip_source_mask, { - "Downstream Classifier IP Source Mask", + "Downstream Classifier IP Source Mask", "docsis_dcd.cfr_ip_source_mask", FT_IPv4, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_ip_dest_addr, { - "Downstream Classifier IP Destination Address", + "Downstream Classifier IP Destination Address", "docsis_dcd.cfr_ip_dest_addr", FT_IPv4, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_ip_dest_mask, { - "Downstream Classifier IP Destination Mask", + "Downstream Classifier IP Destination Mask", "docsis_dcd.cfr_ip_dest_mask", FT_IPv4, BASE_NONE, NULL, 0x0, - "Downstream Classifier IP Destination Address", + "Downstream Classifier IP Destination Address", HFILL } }, {&hf_docsis_dcd_cfr_tcpudp_srcport_start, { - "Downstream Classifier IP TCP/UDP Source Port Start", + "Downstream Classifier IP TCP/UDP Source Port Start", "docsis_dcd.cfr_ip_tcpudp_srcport_start", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_tcpudp_srcport_end, { - "Downstream Classifier IP TCP/UDP Source Port End", + "Downstream Classifier IP TCP/UDP Source Port End", "docsis_dcd.cfr_ip_tcpudp_srcport_end", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_tcpudp_dstport_start, { - "Downstream Classifier IP TCP/UDP Destination Port Start", + "Downstream Classifier IP TCP/UDP Destination Port Start", "docsis_dcd.cfr_ip_tcpudp_dstport_start", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_tcpudp_dstport_end, { - "Downstream Classifier IP TCP/UDP Destination Port End", + "Downstream Classifier IP TCP/UDP Destination Port End", "docsis_dcd.cfr_ip_tcpudp_dstport_end", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_id, { - "DSG Rule Id", + "DSG Rule Id", "docsis_dcd.rule_id", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_pri, { - "DSG Rule Priority", + "DSG Rule Priority", "docsis_dcd.rule_pri", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_ucid_list, { - "DSG Rule UCID Range", + "DSG Rule UCID Range", "docsis_dcd.rule_ucid_list", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, @@ -728,109 +728,109 @@ proto_register_docsis_dcd (void) }, {&hf_docsis_dcd_clid_known_mac_addr, { - "DSG Rule Client ID Known MAC Address", + "DSG Rule Client ID Known MAC Address", "docsis_dcd.clid_known_mac_addr", FT_ETHER, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_clid_ca_sys_id, { - "DSG Rule Client ID CA System ID", + "DSG Rule Client ID CA System ID", "docsis_dcd.clid_ca_sys_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_clid_app_id, { - "DSG Rule Client ID Application ID", + "DSG Rule Client ID Application ID", "docsis_dcd.clid_app_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_tunl_addr, { - "DSG Rule Tunnel MAC Address", + "DSG Rule Tunnel MAC Address", "docsis_dcd.rule_tunl_addr", FT_ETHER, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_cfr_id, { - "DSG Rule Classifier ID", + "DSG Rule Classifier ID", "docsis_dcd.rule_cfr_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_vendor_spec, { - "DSG Rule Vendor Specific Parameters", + "DSG Rule Vendor Specific Parameters", "docsis_dcd.rule_vendor_spec", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_chan, { - "DSG Configuration Channel", + "DSG Configuration Channel", "docsis_dcd.cfg_chan", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg1, { - "DSG Initialization Timeout (Tdsg1)", + "DSG Initialization Timeout (Tdsg1)", "docsis_dcd.cfg_tdsg1", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg2, { - "DSG Operational Timeout (Tdsg2)", + "DSG Operational Timeout (Tdsg2)", "docsis_dcd.cfg_tdsg2", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg3, { - "DSG Two-Way Retry Timer (Tdsg3)", + "DSG Two-Way Retry Timer (Tdsg3)", "docsis_dcd.cfg_tdsg3", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg4, { - "DSG One-Way Retry Timer (Tdsg4)", + "DSG One-Way Retry Timer (Tdsg4)", "docsis_dcd.cfg_tdsg4", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_vendor_spec, { - "DSG Configuration Vendor Specific Parameters", + "DSG Configuration Vendor Specific Parameters", "docsis_dcd.cfg_vendor_spec", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dpvreq.c b/plugins/docsis/packet-dpvreq.c index 41d1090031..c258a8109b 100644 --- a/plugins/docsis/packet-dpvreq.c +++ b/plugins/docsis/packet-dpvreq.c @@ -58,7 +58,7 @@ dissect_dpvreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) dschan = tvb_get_guint8 (tvb, 2); col_add_fstr (pinfo->cinfo, COL_INFO, - "DOCSIS Path Verify Request: Transaction-Id = %u DS-Ch %d", + "DOCSIS Path Verify Request: Transaction-Id = %u DS-Ch %d", transid, dschan); if (tree) @@ -67,23 +67,23 @@ dissect_dpvreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_protocol_format (tree, proto_docsis_dpvreq, tvb, 0, -1, "DPV Request"); dpvreq_tree = proto_item_add_subtree (it, ett_docsis_dpvreq); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_tranid, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_tranid, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_dschan, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_dschan, tvb, 2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_flags, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_flags, tvb, 3, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_us_sf, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_us_sf, tvb, 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_n, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_n, tvb, 8, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_start, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_start, tvb, 10, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_end, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_end, tvb, 11, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_start, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_start, tvb, 12, 4, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_end, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_end, tvb, 16, 4, ENC_BIG_ENDIAN); } } diff --git a/plugins/docsis/packet-dpvrsp.c b/plugins/docsis/packet-dpvrsp.c index b03f62ecca..b9a5e4f239 100644 --- a/plugins/docsis/packet-dpvrsp.c +++ b/plugins/docsis/packet-dpvrsp.c @@ -58,7 +58,7 @@ dissect_dpvrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) dschan = tvb_get_guint8 (tvb, 2); col_add_fstr (pinfo->cinfo, COL_INFO, - "DOCSIS Path Verify Response: Transaction-Id = %u DS-Ch %d", + "DOCSIS Path Verify Response: Transaction-Id = %u DS-Ch %d", transid, dschan); if (tree) @@ -67,23 +67,23 @@ dissect_dpvrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_protocol_format (tree, proto_docsis_dpvrsp, tvb, 0, -1, "DPV Response"); dpvrsp_tree = proto_item_add_subtree (it, ett_docsis_dpvrsp); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_tranid, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_tranid, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_dschan, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_dschan, tvb, 2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_flags, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_flags, tvb, 3, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_us_sf, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_us_sf, tvb, 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_n, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_n, tvb, 8, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_start, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_start, tvb, 10, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_end, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_end, tvb, 11, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_start, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_start, tvb, 12, 4, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_end, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_end, tvb, 16, 4, ENC_BIG_ENDIAN); } } diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c index 8d7a693b0a..e4ab898206 100644 --- a/plugins/docsis/packet-mdd.c +++ b/plugins/docsis/packet-mdd.c @@ -169,7 +169,7 @@ static const value_string mdd_tlv_vals[] = { {CM_STATUS_EVENT_CONTROL , "CM-STATUS Event Control"}, {UPSTREAM_TRANSMIT_POWER_REPORTING , "Upstream Transmit Power Reporting"}, {DSG_DA_TO_DSID_ASSOCIATION_ENTRY , "DSG DA-to-DSID Association Entry"}, - {CM_STATUS_EVENT_ENABLE_NON_CHANNEL_SPECIFIC_EVENTS , + {CM_STATUS_EVENT_ENABLE_NON_CHANNEL_SPECIFIC_EVENTS , "CM-STATUS Event Enable for Non-Channel-Specific-Events"}, {0, NULL} }; diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c index 5d94a6b0ec..7007f14fe5 100644 --- a/plugins/docsis/packet-regreqmp.c +++ b/plugins/docsis/packet-regreqmp.c @@ -49,7 +49,7 @@ static gint ett_docsis_regreqmp = -1; static void dissect_regreqmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { - + proto_item *it; proto_tree *regreqmp_tree = NULL; tvbuff_t *next_tvb; @@ -60,7 +60,7 @@ dissect_regreqmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { it = proto_tree_add_protocol_format (tree, proto_docsis_regreqmp, tvb, 0, -1,"REG-REQ-MP Message"); regreqmp_tree = proto_item_add_subtree (it, ett_docsis_regreqmp); - + proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_sid, tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_number_of_fragments, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_fragment_sequence_number, tvb, 3, 1, ENC_BIG_ENDIAN); diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c index 8ec78a05fc..2c1a840190 100644 --- a/plugins/docsis/packet-regrspmp.c +++ b/plugins/docsis/packet-regrspmp.c @@ -55,22 +55,22 @@ dissect_regrspmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_item *it; proto_tree *regrspmp_tree = NULL; tvbuff_t *next_tvb; - - - - + + + + col_set_str(pinfo->cinfo, COL_INFO, "REG-RSP-MP Message:"); - + if (tree) { it = proto_tree_add_protocol_format (tree, proto_docsis_regrspmp, tvb, 0, -1,"REG-RSP-MP Message"); regrspmp_tree = proto_item_add_subtree (it, ett_docsis_regrspmp); - + proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_sid, tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_response, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_number_of_fragments, tvb, 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_fragment_sequence_number, tvb, 4, 1, ENC_BIG_ENDIAN); - + } /* Call Dissector for Appendix C TLV's */ next_tvb = tvb_new_subset_remaining (tvb, 5); @@ -124,11 +124,11 @@ proto_register_docsis_regrspmp (void) proto_docsis_regrspmp = proto_register_protocol ("DOCSIS Registration Response Multipart", "DOCSIS Reg-Rsp-Mp", "docsis_regrspmp"); - + /* Required function calls to register the header fields and subtrees used */ proto_register_field_array (proto_docsis_regrspmp, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - + register_dissector ("docsis_regrspmp", dissect_regrspmp, proto_docsis_regrspmp); } @@ -141,7 +141,7 @@ void proto_reg_handoff_docsis_regrspmp (void) { dissector_handle_t docsis_regrspmp_handle; - + docsis_tlv_handle = find_dissector ("docsis_tlv"); docsis_regrspmp_handle = find_dissector ("docsis_regrspmp"); dissector_add_uint ("docsis_mgmt", 45, docsis_regrspmp_handle); diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c index 917cba2f34..f892bddd2e 100644 --- a/plugins/docsis/packet-tlv.c +++ b/plugins/docsis/packet-tlv.c @@ -4499,7 +4499,7 @@ proto_register_docsis_tlv (void) "Ranging Hold-Off (ePS or eRouter)", HFILL} }, {&hf_docsis_tlv_mcap_rnghoff_emta, - {".16 Ranging Hold-Off (eMTA or EDVA)", + {".16 Ranging Hold-Off (eMTA or EDVA)", "docsis_tlv.mcap.rnghoffemta", FT_UINT32, BASE_DEC, VALS (on_off_vals), 0x4, "Ranging Hold-Off (eMTA or EDVA)", HFILL} diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c index 23f2cc60aa..09ba018662 100644 --- a/plugins/docsis/packet-type29ucd.c +++ b/plugins/docsis/packet-type29ucd.c @@ -270,7 +270,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) pos, length, ENC_NA); pos = pos + length; break; -/* DOCSIS 2.0 UCD TLV definitions +/* DOCSIS 2.0 UCD TLV definitions * #define type29ucd_EXT_PREAMBLE 6 * #define type29ucd_SCDMA_MODE_ENABLE 7 * #define type29ucd_SCDMA_SPREADING_INTERVAL 8 @@ -407,7 +407,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) THROW (ReportedBoundsError); } pos = pos + length; - break; + break; /* DOCSIS 1.1 BURST DESCRIPTOR */ case type29ucd_BURST_DESCR: it = diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c index 6ff1d7866b..5be9bd974b 100644 --- a/plugins/docsis/packet-ucd.c +++ b/plugins/docsis/packet-ucd.c @@ -147,7 +147,7 @@ value_string iuc_vals[] = { {IUC_RESERVED14, "Reserved"}, {IUC_EXPANSION, "Expanded IUC"}, {0, NULL} - + }; static const value_string last_cw_len_vals[] = { @@ -168,10 +168,10 @@ static void proto_item *tlv_item; gint len; guint8 upchid, symrate; - + len = tvb_reported_length_remaining (tvb, 0); upchid = tvb_get_guint8 (tvb, 0); - + /* if the upstream Channel ID is 0 then this is for Telephony Return) */ if (upchid > 0) col_add_fstr (pinfo->cinfo, COL_INFO, @@ -181,7 +181,7 @@ static void col_add_fstr (pinfo->cinfo, COL_INFO, "UCD Message: Channel ID = %u (Telephony Return)", upchid); - + if (tree) { ucd_item = @@ -196,7 +196,7 @@ static void ENC_BIG_ENDIAN); proto_tree_add_item (ucd_tree, hf_docsis_ucd_down_chid, tvb, 3, 1, ENC_BIG_ENDIAN); - + pos = 4; while (pos < len) { @@ -204,7 +204,7 @@ static void tlv_item = proto_tree_add_text (ucd_tree, tvb, pos, -1, "%s", val_to_str(type, channel_tlv_vals, - "Unknown TLV (%u)")); + "Unknown TLV (%u)")); tlv_tree = proto_item_add_subtree (tlv_item, ett_tlv); proto_tree_add_uint (tlv_tree, hf_docsis_ucd_type, tvb, pos, 1, type); @@ -635,7 +635,7 @@ static void } /* switch(type) */ } /* while (pos < len) */ } /* if (tree) */ - + } /* Register the protocol with Wireshark */ @@ -648,7 +648,7 @@ static void void proto_register_docsis_ucd (void) { - + /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { {&hf_docsis_ucd_upstream_chid, @@ -792,22 +792,22 @@ proto_register_docsis_ucd (void) "TCM Enabled", HFILL} }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_docsis_ucd, &ett_tlv, }; - + /* Register the protocol name and description */ proto_docsis_ucd = proto_register_protocol ("DOCSIS Upstream Channel Descriptor", "DOCSIS UCD", "docsis_ucd"); - + /* Required function calls to register the header fields and subtrees used */ proto_register_field_array (proto_docsis_ucd, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - + register_dissector ("docsis_ucd", dissect_ucd, proto_docsis_ucd); } @@ -820,8 +820,8 @@ void proto_reg_handoff_docsis_ucd (void) { dissector_handle_t docsis_ucd_handle; - + docsis_ucd_handle = find_dissector ("docsis_ucd"); dissector_add_uint ("docsis_mgmt", 0x02, docsis_ucd_handle); - + } |