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 | |
| parent | c55c57ad72acda8cbce2841bc237f966bad5ae5b (diff) | |
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')
53 files changed, 339 insertions, 339 deletions
diff --git a/plugins/asn1/asn1.c b/plugins/asn1/asn1.c index 9d6bf9fb51..25e4b780dd 100644 --- a/plugins/asn1/asn1.c +++ b/plugins/asn1/asn1.c @@ -417,7 +417,7 @@ asn1_null_decode ( ASN1_SCK *asn1, int enc_len) asn1->offset += enc_len; /* - * Check for integer overflows. + * Check for integer overflows. * XXX - ASN1_ERR_LENGTH_MISMATCH seemed like the most appropriate * error from the ones available. Should we make a new one? */ diff --git a/plugins/asn1/asn1.h b/plugins/asn1/asn1.h index 49cdbc7317..826ac2fff8 100644 --- a/plugins/asn1/asn1.h +++ b/plugins/asn1/asn1.h @@ -55,7 +55,7 @@ #define BER_UNI_TAG_EMBEDDED_PDV 11 #define BER_UNI_TAG_UTF8String 12 #define BER_UNI_TAG_RELATIVE_OID 13 -/* UNIVERSAL 14-15 +/* UNIVERSAL 14-15 * Reserved for future editions of this * Recommendation | International Standard */ 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); - + } diff --git a/plugins/easy_codec/codec-g722.c b/plugins/easy_codec/codec-g722.c index a96a747611..35cce0dc65 100644 --- a/plugins/easy_codec/codec-g722.c +++ b/plugins/easy_codec/codec-g722.c @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -59,10 +59,10 @@ int codec_g722_decode(void *context, const void *input, int inputSizeBytes, void short *speech = (short*)output; int decodedBytes = 0; int i; - + if (!ctx) return 0; - if ((inputSizeBytes % L_G722_FRAME_COMPRESSED) != 0) + if ((inputSizeBytes % L_G722_FRAME_COMPRESSED) != 0) return 0; if (!output) @@ -72,13 +72,13 @@ int codec_g722_decode(void *context, const void *input, int inputSizeBytes, void ((*outputSizeBytes - decodedBytes) >= L_G722_FRAME / 2 * sizeof(short))) { if (EasyG722_decoder(ctx->handle, (unsigned char*)bitstream, ctx->speach_buffer)) { int write_index = 0; - + for(i = 0; i < L_G722_FRAME; i+=2) { ctx->speach_buffer[write_index] = ctx->speach_buffer[i]; write_index++; } memcpy(speech, ctx->speach_buffer, L_G722_FRAME / 2 * sizeof(short)); - + speech += L_G722_FRAME / 2; decodedBytes += L_G722_FRAME / 2 * sizeof(short); diff --git a/plugins/easy_codec/codec-g722.h b/plugins/easy_codec/codec-g722.h index fed52761ec..f13899fbbb 100644 --- a/plugins/easy_codec/codec-g722.h +++ b/plugins/easy_codec/codec-g722.h @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/plugins/easy_codec/codec-g7231.c b/plugins/easy_codec/codec-g7231.c index 8408ad0c53..1cb7017edd 100644 --- a/plugins/easy_codec/codec-g7231.c +++ b/plugins/easy_codec/codec-g7231.c @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -59,9 +59,9 @@ int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, voi const unsigned char *bitstream = (const unsigned char*)input; short *speech = (short*)output; int decodedBytes = 0; - + if (!ctx) return 0; - + if ( ctx->handle == -1) { if ( bitstream[0] & 0x03 ) { ctx->handle=EasyG7231_init_decoder(FALSE); @@ -69,10 +69,10 @@ int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, voi } else { ctx->handle=EasyG7231_init_decoder(TRUE); ctx->l_g7231_frame_compressed = L_G7231_FRAME_COMPRESSED_63; - } + } } - - if ((inputSizeBytes % ctx->l_g7231_frame_compressed) != 0) + + if ((inputSizeBytes % ctx->l_g7231_frame_compressed) != 0) return 0; if (!output) @@ -86,7 +86,7 @@ int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, voi memcpy(speech, ctx->speach_buffer, L_G7231_FRAME * sizeof(short)); speech += L_G7231_FRAME; decodedBytes += L_G7231_FRAME * sizeof(short); - + } bitstream += ctx->l_g7231_frame_compressed; inputSizeBytes -= ctx->l_g7231_frame_compressed; diff --git a/plugins/easy_codec/codec-g7231.h b/plugins/easy_codec/codec-g7231.h index 05f5f358ba..8faebe3fa2 100644 --- a/plugins/easy_codec/codec-g7231.h +++ b/plugins/easy_codec/codec-g7231.h @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/plugins/easy_codec/codec-g729a.c b/plugins/easy_codec/codec-g729a.c index 399d02f787..0b692b7c15 100644 --- a/plugins/easy_codec/codec-g729a.c +++ b/plugins/easy_codec/codec-g729a.c @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -61,7 +61,7 @@ int codec_g729a_decode(void *context, const void *input, int inputSizeBytes, voi if (!ctx) return 0; - if ((inputSizeBytes % L_G729A_FRAME_COMPRESSED) != 0) + if ((inputSizeBytes % L_G729A_FRAME_COMPRESSED) != 0) return 0; if (!output) diff --git a/plugins/easy_codec/codec-g729a.h b/plugins/easy_codec/codec-g729a.h index 65225beddd..d1d73e04cb 100644 --- a/plugins/easy_codec/codec-g729a.h +++ b/plugins/easy_codec/codec-g729a.h @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/plugins/easy_codec/easy_codec_plugin.c b/plugins/easy_codec/easy_codec_plugin.c index 2e586787ce..77577752c8 100644 --- a/plugins/easy_codec/easy_codec_plugin.c +++ b/plugins/easy_codec/easy_codec_plugin.c @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/plugins/ethercat/packet-ethercat-datagram.h b/plugins/ethercat/packet-ethercat-datagram.h index 71ec746697..7b9f4e3152 100644 --- a/plugins/ethercat/packet-ethercat-datagram.h +++ b/plugins/ethercat/packet-ethercat-datagram.h @@ -7,17 +7,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -26,7 +26,7 @@ #define _PACKET_ETHERCAT_DATAGRAM_ /* structure for decoding the header -----------------------------------------*/ -typedef union +typedef union { struct { diff --git a/plugins/ethercat/packet-ethercat-frame.h b/plugins/ethercat/packet-ethercat-frame.h index f552a2444a..b9a7245115 100644 --- a/plugins/ethercat/packet-ethercat-frame.h +++ b/plugins/ethercat/packet-ethercat-frame.h @@ -7,17 +7,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/plugins/ethercat/packet-ioraw.h b/plugins/ethercat/packet-ioraw.h index fbbc1ceafe..d713867371 100644 --- a/plugins/ethercat/packet-ioraw.h +++ b/plugins/ethercat/packet-ioraw.h @@ -7,17 +7,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/plugins/ethercat/packet-nv.h b/plugins/ethercat/packet-nv.h index 19fbe951e2..7a3f4ec852 100644 --- a/plugins/ethercat/packet-nv.h +++ b/plugins/ethercat/packet-nv.h @@ -7,17 +7,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/plugins/gryphon/packet-gryphon.h b/plugins/gryphon/packet-gryphon.h index f69ddfff36..556251e9af 100644 --- a/plugins/gryphon/packet-gryphon.h +++ b/plugins/gryphon/packet-gryphon.h @@ -151,14 +151,14 @@ /* USDT (SD_IOPWR) target commands: */ -#define CMD_IOPWR_GETINP (SD_IOPWR * 256 + 0x40) /* Read current digital inputs */ -#define CMD_IOPWR_GETLATCH (SD_IOPWR * 256 + 0x41) /* Read latched digital inputs */ -#define CMD_IOPWR_CLRLATCH (SD_IOPWR * 256 + 0x42) /* Read & clear latched inputs */ -#define CMD_IOPWR_GETOUT (SD_IOPWR * 256 + 0x43) /* Read digital outputs */ -#define CMD_IOPWR_SETOUT (SD_IOPWR * 256 + 0x44) /* Write digital outputs */ -#define CMD_IOPWR_SETBIT (SD_IOPWR * 256 + 0x45) /* Set indicated output bit(s) */ -#define CMD_IOPWR_CLRBIT (SD_IOPWR * 256 + 0x46) /* Clear indicated output bit(s)*/ -#define CMD_IOPWR_GETPOWER (SD_IOPWR * 256 + 0x47) /* Read inputs at power on time */ +#define CMD_IOPWR_GETINP (SD_IOPWR * 256 + 0x40) /* Read current digital inputs */ +#define CMD_IOPWR_GETLATCH (SD_IOPWR * 256 + 0x41) /* Read latched digital inputs */ +#define CMD_IOPWR_CLRLATCH (SD_IOPWR * 256 + 0x42) /* Read & clear latched inputs */ +#define CMD_IOPWR_GETOUT (SD_IOPWR * 256 + 0x43) /* Read digital outputs */ +#define CMD_IOPWR_SETOUT (SD_IOPWR * 256 + 0x44) /* Write digital outputs */ +#define CMD_IOPWR_SETBIT (SD_IOPWR * 256 + 0x45) /* Set indicated output bit(s) */ +#define CMD_IOPWR_CLRBIT (SD_IOPWR * 256 + 0x46) /* Clear indicated output bit(s)*/ +#define CMD_IOPWR_GETPOWER (SD_IOPWR * 256 + 0x47) /* Read inputs at power on time */ /* Miscellaneous (SD_UTIL) target commands: */ diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/opcua/opcua_application_layer.c index 3ebf95de68..2aa9e10f3b 100644 --- a/plugins/opcua/opcua_application_layer.c +++ b/plugins/opcua/opcua_application_layer.c @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License ** as published by the Free Software Foundation; either version 2 ** of the License, or (at your option) any later version. -** +** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Application Layer Decoder. diff --git a/plugins/opcua/opcua_application_layer.h b/plugins/opcua/opcua_application_layer.h index 066a353f97..005be67940 100644 --- a/plugins/opcua/opcua_application_layer.h +++ b/plugins/opcua/opcua_application_layer.h @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License ** as published by the Free Software Foundation; either version 2 ** of the License, or (at your option) any later version. -** +** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Application Layer Decoder. diff --git a/plugins/opcua/opcua_complextypeparser.c b/plugins/opcua/opcua_complextypeparser.c index afa119d67a..4b245e490c 100644 --- a/plugins/opcua/opcua_complextypeparser.c +++ b/plugins/opcua/opcua_complextypeparser.c @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License ** as published by the Free Software Foundation; either version 2 ** of the License, or (at your option) any later version. -** +** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Complex Type Parser diff --git a/plugins/opcua/opcua_security_layer.h b/plugins/opcua/opcua_security_layer.h index d42f739e2f..6d604bde2a 100644 --- a/plugins/opcua/opcua_security_layer.h +++ b/plugins/opcua/opcua_security_layer.h @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License ** as published by the Free Software Foundation; either version 2 ** of the License, or (at your option) any later version. -** +** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Security Layer Decoder. diff --git a/plugins/opcua/opcua_serviceparser.c b/plugins/opcua/opcua_serviceparser.c index c6547639ff..e20a9f120c 100644 --- a/plugins/opcua/opcua_serviceparser.c +++ b/plugins/opcua/opcua_serviceparser.c @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License ** as published by the Free Software Foundation; either version 2 ** of the License, or (at your option) any later version. -** +** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Complex Type Parser diff --git a/plugins/opcua/opcua_simpletypes.h b/plugins/opcua/opcua_simpletypes.h index 5eed3da701..7cf65f2ada 100644 --- a/plugins/opcua/opcua_simpletypes.h +++ b/plugins/opcua/opcua_simpletypes.h @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License ** as published by the Free Software Foundation; either version 2 ** of the License, or (at your option) any later version. -** +** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: Implementation of OpcUa built-in type parsers. diff --git a/plugins/opcua/opcua_transport_layer.h b/plugins/opcua/opcua_transport_layer.h index e4788050e3..70d06a7695 100644 --- a/plugins/opcua/opcua_transport_layer.h +++ b/plugins/opcua/opcua_transport_layer.h @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License ** as published by the Free Software Foundation; either version 2 ** of the License, or (at your option) any later version. -** +** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Transport Layer Decoder. diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 582c3ff6e7..7e396ef6b4 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -8754,7 +8754,7 @@ dissect_ProfiDriveParameterRequest(tvbuff_t *tvb, int offset, proto_item_append_text(sub_item, "Format:%s, NoOfVals:%u", val_to_str(format, pn_io_profidrive_format_vals, "Unknown"), no_of_vals); - while (no_of_vals--) + while (no_of_vals--) { offset = dissect_profidrive_value(tvb, offset, pinfo, sub_tree, drep, format); } @@ -8816,7 +8816,7 @@ dissect_ProfiDriveParameterResponse(tvbuff_t *tvb, int offset, proto_item_append_text(sub_item, "Format:%s, NoOfVals:%u", val_to_str(format, pn_io_profidrive_format_vals, "Unknown"), no_of_vals); - while (no_of_vals--) + while (no_of_vals--) { offset = dissect_profidrive_value(tvb, offset, pinfo, sub_tree, drep, format); } diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c index 5ebc9367f5..97265ded60 100644 --- a/plugins/stats_tree/pinfo_stats_tree.c +++ b/plugins/stats_tree/pinfo_stats_tree.c @@ -83,7 +83,7 @@ uat_plen_record_update_cb(void *r, const char **err) static void uat_plen_record_free_cb(void*r) { uat_plen_record_t* record = (uat_plen_record_t*)r; - if (record->packet_range) + if (record->packet_range) g_free(record->packet_range); } diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c index b25e8f91a9..f4c073f745 100644 --- a/plugins/stats_tree/stats_tree_plugin.c +++ b/plugins/stats_tree/stats_tree_plugin.c @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/plugins/unistim/audio.h b/plugins/unistim/audio.h index 30ab161679..03246082d6 100644 --- a/plugins/unistim/audio.h +++ b/plugins/unistim/audio.h @@ -1,5 +1,5 @@ /* audio.h - * header field declarations, value_string definitions and true_false_string + * header field declarations, value_string definitions and true_false_string * definitions for audio manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * @@ -283,15 +283,15 @@ static const true_false_string opt_rpt_enable_max_tone_vol={ "Maximum tone volume is set equal to the physical maximum", "Maximum tone volume is one level lower than physical maximum" }; -static const true_false_string opt_rpths_on_air_feature={ +static const true_false_string opt_rpths_on_air_feature={ "Single tone frequency sent to HS port while call in progress", "Single tone frequency NOT sent to HS port while call in progress" }; -static const true_false_string opt_rpt_hd_on_air_feature={ +static const true_false_string opt_rpt_hd_on_air_feature={ "Single tone frequency sent to HD port while call in progress", "Single tone frequency NOT sent to HD port while call in progress" }; -static const true_false_string opt_rpt_noise_sqlch_disable={ +static const true_false_string opt_rpt_noise_sqlch_disable={ "Automatic noise squelching enabled", "Automatic noise squelching disabled" }; @@ -440,7 +440,7 @@ static const value_string apb_op_codes[]={ {0x54,"Change Default Volume setting"}, {0x55,"Change Current Volume setting"}, {0x56,"Sampling Rate setting"}, - {0x57,"The filter(s) to be used when the HIP is enabled"}, + {0x57,"The filter(s) to be used when the HIP is enabled"}, {0x58,"The threshold that should be used when AGC is enabled"}, {0x59,"The threshold that should be used when Listener Sidetone (LST) is enabled"}, {0,NULL} @@ -536,7 +536,7 @@ static const true_false_string audio_opts_hs_on_air_feature={ static const true_false_string audio_opts_hd_on_air_feature={ "Single tone frequency sent to Headset (HD) port while call in progress", "Single tone frequency NOT sent to Headset (HD) port while call in progress" -}; +}; static const true_false_string noise_sqlch_disable={ "Automatic noise squelching enabled", "Automatic noise squelching disabled" diff --git a/plugins/unistim/basic.h b/plugins/unistim/basic.h index fc96165325..f052556df4 100644 --- a/plugins/unistim/basic.h +++ b/plugins/unistim/basic.h @@ -1,5 +1,5 @@ /* basic.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for basic manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/broadcast.h b/plugins/unistim/broadcast.h index 7bc6813bd4..de51e3d518 100644 --- a/plugins/unistim/broadcast.h +++ b/plugins/unistim/broadcast.h @@ -1,5 +1,5 @@ /* broadcast.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for broadcast manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/display.h b/plugins/unistim/display.h index 08aa56239b..db19471c6e 100644 --- a/plugins/unistim/display.h +++ b/plugins/unistim/display.h @@ -1,5 +1,5 @@ /*display.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for display manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/expansion.h b/plugins/unistim/expansion.h index 249316b64e..56163ff586 100644 --- a/plugins/unistim/expansion.h +++ b/plugins/unistim/expansion.h @@ -1,5 +1,5 @@ /* expansion.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for basic manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/key.h b/plugins/unistim/key.h index e3afb88f58..77d43b1bb2 100644 --- a/plugins/unistim/key.h +++ b/plugins/unistim/key.h @@ -1,5 +1,5 @@ /* key.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for key manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * @@ -108,7 +108,7 @@ static const value_string key_phone_msgs[]={ {0,NULL} }; - + static const true_false_string key_release={ "The Key code will be sent when a valid key release occurs", "No command will be sent when a key is released" @@ -125,7 +125,7 @@ static const true_false_string acd_supervisor={ "ACD supervisor path and indicator controlled by the Switch", "ACD supervisor path and indicator controlled by the Phone" }; - + static const value_string local_dialpad_feedback[]={ {0x00,"No tone feedback provided when a dial pad key is depressed"}, {0x01,"Short 'click' provided when a dial pad key is depressed"}, @@ -149,7 +149,7 @@ static const value_string led_ids[]={ {0x03,"Mute LED"}, {0,NULL} }; - + static const value_string led_cadences[]={ {0x00,"Off"}, {0x01,"On"}, diff --git a/plugins/unistim/network.h b/plugins/unistim/network.h index b53d5718b7..c95cda2253 100644 --- a/plugins/unistim/network.h +++ b/plugins/unistim/network.h @@ -1,5 +1,5 @@ /* network.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for network manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index b28a71b5b7..7c2f9622e3 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -508,7 +508,7 @@ dissect_unistim_message(proto_tree *unistim_tree,packet_info *pinfo,tvbuff_t *tv offset+=(msg_len-2); } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } return offset; @@ -599,7 +599,7 @@ dissect_basic_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -676,7 +676,7 @@ dissect_basic_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -754,7 +754,7 @@ dissect_broadcast_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1402,7 +1402,7 @@ dissect_display_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1513,7 +1513,7 @@ dissect_display_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1631,7 +1631,7 @@ dissect_key_indicator_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1725,7 +1725,7 @@ dissect_key_indicator_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1869,7 +1869,7 @@ dissect_network_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -2052,7 +2052,7 @@ dissect_network_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -2486,7 +2486,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -2710,7 +2710,7 @@ dissect_audio_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } diff --git a/plugins/unistim/packet-unistim.h b/plugins/unistim/packet-unistim.h index 0c873961bc..ce3402201c 100644 --- a/plugins/unistim/packet-unistim.h +++ b/plugins/unistim/packet-unistim.h @@ -1,5 +1,5 @@ /* packet-unistim.h - * header field declarations, value_string definitions, true_false_string + * header field declarations, value_string definitions, true_false_string * definitions and function prototypes for main dissectors * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/uftp.h b/plugins/unistim/uftp.h index e081e375d1..0fd1eb3e6d 100644 --- a/plugins/unistim/uftp.h +++ b/plugins/unistim/uftp.h @@ -1,5 +1,5 @@ /* uftp.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for uftp commands and messages * Copyright 2007 Chad Singer <csinger@cypresscom.net> * diff --git a/plugins/wimax/crc.c b/plugins/wimax/crc.c index b2dc4090dd..cd169c2725 100644 --- a/plugins/wimax/crc.c +++ b/plugins/wimax/crc.c @@ -47,11 +47,11 @@ extern guint16 crc16_table[256]; DESCRIPTION: Generate the table of CRC remainders for all possible bytes - + ARGS: RETURNS: - + SIDE EFFECTS: */ @@ -62,16 +62,16 @@ void wimax_mac_gen_crc32_table(void) /* little-endian (reflected) algorithm */ for ( index = 0; index < G_N_ELEMENTS(crc32_table); index++ ) - { + { crc = ( index << 24 ); for ( bit = 0; bit < 8; bit++ ) { if ( crc & 0x80000000U ) crc = ( crc << 1 ) ^ WMAX_MAC_CRC32_POLYNOMIAL; else - crc = ( crc << 1 ); + crc = ( crc << 1 ); } - crc32_table[index] = crc; + crc32_table[index] = crc; } } @@ -94,18 +94,18 @@ void wimax_mac_gen_crc8_table(void) { guint index, bit; guint8 crc; - + for ( index = 0; index < G_N_ELEMENTS(crc8_table); index++ ) - { + { crc = index; for ( bit = 0; bit < 8; bit++ ) { if ( crc & 0x80 ) crc = ( crc << 1 ) ^ WMAX_MAC_CRC8_POLYNOMIAL; else - crc = ( crc << 1 ); + crc = ( crc << 1 ); } - crc8_table[index] = crc; + crc8_table[index] = crc; } } #endif @@ -122,7 +122,7 @@ void wimax_mac_gen_crc8_table(void) data_len - length of data (in bytes) RETURNS: calculated crc32 - + SIDE EFFECTS: */ @@ -132,9 +132,9 @@ guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len) guint i, j; for ( j = 0; j < data_len; j++ ) - { + { i = ( (guint8)(crc>>24) ^ data[j] ) & 0xff; - crc = ( crc<<8 ) ^ crc32_table[i]; + crc = ( crc<<8 ) ^ crc32_table[i]; } return ~crc; } @@ -151,7 +151,7 @@ guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len) data_len - length of data (in bytes) RETURNS: calculated crc16 - + SIDE EFFECTS: */ @@ -161,7 +161,7 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) guint j; for ( j = 0; j < data_len; j++ ) - { + { crc ^= data[j] << 8; crc = (crc << 8) ^ crc16_table[(crc & 0xff00) >> 8]; } @@ -182,7 +182,7 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) data_len - length of data (in bytes) RETURNS: calculated crc8 - + SIDE EFFECTS: */ diff --git a/plugins/wimax/crc_data.c b/plugins/wimax/crc_data.c index f97774a4c6..e02411ba08 100644 --- a/plugins/wimax/crc_data.c +++ b/plugins/wimax/crc_data.c @@ -137,37 +137,37 @@ guint8 hcs_table[256] = { #endif guint16 crc16_table[256] = { - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, - 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, - 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, - 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, - 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, - 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, - 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, - 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, - 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, - 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, - 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, - 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, - 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, - 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, - 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, - 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, - 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, - 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, - 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, - 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, - 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, - 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, - 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, - 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, - 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, - 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, - 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, - 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, - 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, - 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, - 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, - 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, + 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, + 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, + 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, + 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, + 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, + 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, + 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, + 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, + 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, + 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, + 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, + 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, + 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, + 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, + 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, + 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, + 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, + 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, + 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, + 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, + 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, + 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, + 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, + 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, + 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, + 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, + 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, + 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, + 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, + 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, + 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, + 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, }; diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c index 0ff2cefc50..d505692449 100644 --- a/plugins/wimax/mac_mgmt_msg_decoder.c +++ b/plugins/wimax/mac_mgmt_msg_decoder.c @@ -161,7 +161,7 @@ static void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, prot proto_item_append_text(proto_tree_get_parent(tree), ", %s", mgt_msg_str); /* Decode and display the MAC payload */ - if (!dissector_try_uint(subdissector_message_table, message_type, + if (!dissector_try_uint(subdissector_message_table, message_type, tvb_new_subset_remaining(tvb, 1), pinfo, tree)) { proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, -1, ENC_NA); diff --git a/plugins/wimax/msg_dsa.c b/plugins/wimax/msg_dsa.c index b781f9fe9a..a80c368bcf 100644 --- a/plugins/wimax/msg_dsa.c +++ b/plugins/wimax/msg_dsa.c @@ -61,7 +61,7 @@ static void dissect_mac_mgmt_msg_dsa_req_decoder(tvbuff_t *tvb, packet_info *pin { /* we are being asked for details */ /* display MAC message type */ - dsa_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsa_decoder, tvb, offset, -1, + dsa_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsa_decoder, tvb, offset, -1, "Dynamic Service Addition Request (DSA-REQ)"); /* add MAC DSx subtree */ dsa_tree = proto_item_add_subtree(dsa_item, ett_mac_mgmt_msg_dsa_req_decoder); diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index 7f2a494aa2..79338b01fa 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -209,35 +209,35 @@ void proto_register_mac_mgmt_msg_dsd(void) { &hf_dsd_confirmation_code, { - "Confirmation code", "wmx.dsd.confirmation_code", + "Confirmation code", "wmx.dsd.confirmation_code", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_service_flow_id, { - "Service Flow ID", "wmx.dsd.service_flow_id", + "Service Flow ID", "wmx.dsd.service_flow_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_transaction_id, { - "Transaction ID", "wmx.dsd.transaction_id", + "Transaction ID", "wmx.dsd.transaction_id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_invalid_tlv, { - "Invalid TLV", "wmx.dsd.invalid_tlv", + "Invalid TLV", "wmx.dsd.invalid_tlv", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_unknown_type, { - "Unknown type", "wmx.dsd.unknown_type", + "Unknown type", "wmx.dsd.unknown_type", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } } diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c index c8093d4052..a2a50739de 100644 --- a/plugins/wimax/msg_reg_req.c +++ b/plugins/wimax/msg_reg_req.c @@ -259,7 +259,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb case REG_UL_TRANSPORT_CIDS_SUPPORTED: add_tlv_subtree(&tlv_info, reg_req_tree, hf_reg_ul_cids, tvb, offset, ENC_BIG_ENDIAN); break; - + case REG_POWER_SAVING_CLASS_CAPABILITY: tlv_item = add_tlv_subtree(&tlv_info, reg_req_tree, hf_reg_power_saving_class_capability, tvb, offset, ENC_BIG_ENDIAN); tlv_tree = proto_item_add_subtree(tlv_item, ett_mac_mgmt_msg_reg_req_decoder); diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index fab1caece7..27602152a2 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -513,11 +513,11 @@ static void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pin add_tlv_subtree(&tlv_info, rng_rsp_tree, hf_tlv_type, tvb, offset, ENC_NA); } break; - + default: add_tlv_subtree(&tlv_info, rng_rsp_tree, hf_tlv_type, tvb, offset, ENC_NA); break; - + } offset = tlv_len + tlv_offset; } /* end of TLV process while loop */ @@ -752,7 +752,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) { &hf_rng_invalid_tlv, { - "Invalid TLV", "wmx.rng_rsp.invalid_tlv", + "Invalid TLV", "wmx.rng_rsp.invalid_tlv", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, |