diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-10-05 21:34:19 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-10-06 01:42:32 +0000 |
| commit | 0111e461938d47efd1eb8dc17f135b93b253ab52 (patch) | |
| tree | 9409d7bf28086b3fd230993210264df1e884ec5b /plugins/wimax | |
| parent | 9e776a1ed114bb3982c061b41389143cb67b94de (diff) | |
plugins: Add editor modelines; Adjust whitespace as needed.
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088
Reviewed-on: https://code.wireshark.org/review/4488
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'plugins/wimax')
32 files changed, 854 insertions, 439 deletions
diff --git a/plugins/wimax/crc.c b/plugins/wimax/crc.c index 0d65a69438..b2c9b53e45 100644 --- a/plugins/wimax/crc.c +++ b/plugins/wimax/crc.c @@ -28,7 +28,7 @@ #define WMAX_MAC_CRC32_POLYNOMIAL 0x04c11db7U /* polynomial used in calculating the CRC-32 checksum */ #define CCITT_X25_CRC16_POLYNOMIAL 0x1021 /* polynomial used in calculating the CRC-16 checksum */ -#define WMAX_MAC_CRC8_POLYNOMIAL 0x07 /* polynomial used in calculating the CRC-8 checksum */ +#define WMAX_MAC_CRC8_POLYNOMIAL 0x07 /* polynomial used in calculating the CRC-8 checksum */ #define CRC32_INITIAL_VALUE 0xFFFFFFFF #define CRC16_INITIAL_VALUE 0xFFFF @@ -163,7 +163,7 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) crc ^= data[j] << 8; crc = (crc << 8) ^ crc16_table[(crc & 0xff00) >> 8]; } - crc ^= 0xFFFF; /* Invert the output. */ + crc ^= 0xFFFF; /* Invert the output. */ crc &= 0xFFFF; return crc; } @@ -195,3 +195,16 @@ guint8 wimax_mac_calc_crc8(const guint8 *data, guint data_len) } return crc; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/plugins/wimax/crc_data.c b/plugins/wimax/crc_data.c index 41ee481cb8..3bcf8ceb1e 100644 --- a/plugins/wimax/crc_data.c +++ b/plugins/wimax/crc_data.c @@ -169,3 +169,15 @@ guint16 crc16_table[256] = { 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, }; +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c index 6a141f5350..3613dd357c 100644 --- a/plugins/wimax/mac_hd_type1_decoder.c +++ b/plugins/wimax/mac_hd_type1_decoder.c @@ -117,8 +117,8 @@ static const char *type1_subtype_abbrv[TYPE_I_SUBTYPE_MAX] = #define WIMAX_MAC_HEADER_TYPE_1_RSV_7 0x000FFF /* 4th to 6th bytes */ /*#define WIMAX_MAC_HEADER_TYPE_1_CID 0xFFFF -*#define WIMAX_MAC_HEADER_TYPE_1_HCS 0xFF -*/ + *#define WIMAX_MAC_HEADER_TYPE_1_HCS 0xFF + */ /* Common Fields */ static int hf_mac_header_type_1_ht = -1; static int hf_mac_header_type_1_ec = -1; @@ -158,14 +158,14 @@ static int hf_mac_header_type_1_hcs = -1; /* MAC Header Type I Sub-Types */ static const value_string sub_types[] = { - { BR_INCREMENTAL, "Bandwidth Request Incremental" }, - { BR_AGGREGATE, "Bandwidth Request Aggregate" }, - { PHY_CHANNEL_REPORT, "PHY Channel Report" }, + { BR_INCREMENTAL, "Bandwidth Request Incremental" }, + { BR_AGGREGATE, "Bandwidth Request Aggregate" }, + { PHY_CHANNEL_REPORT, "PHY Channel Report" }, { BR_WITH_UL_TX_POWER_REPORT, "Bandwidth Request with UL TX Power Report" }, - { BR_AND_CINR_REPORT, "Bandwidth Request and CINR Report" }, - { BR_WITH_UL_SLEEP_CONTROL, "Bandwidth Request with Sleep Control" }, - { SN_REPORT, "SN Report" }, - { CQICH_ALLOCATION_REQUEST, "CQICH Allocation Request" }, + { BR_AND_CINR_REPORT, "Bandwidth Request and CINR Report" }, + { BR_WITH_UL_SLEEP_CONTROL, "Bandwidth Request with Sleep Control" }, + { SN_REPORT, "SN Report" }, + { CQICH_ALLOCATION_REQUEST, "CQICH Allocation Request" }, { 0, NULL} }; @@ -558,3 +558,16 @@ void proto_register_mac_header_type_1(void) register_dissector("mac_header_type_1_handler", dissect_mac_header_type_1_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c index e69732422a..4d8fe93a41 100644 --- a/plugins/wimax/mac_hd_type2_decoder.c +++ b/plugins/wimax/mac_hd_type2_decoder.c @@ -1369,3 +1369,16 @@ void proto_register_mac_header_type_2(void) register_dissector("mac_header_type_2_handler", dissect_mac_header_type_2_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c index 2b9fa33ffd..c093927cc5 100644 --- a/plugins/wimax/mac_mgmt_msg_decoder.c +++ b/plugins/wimax/mac_mgmt_msg_decoder.c @@ -48,75 +48,75 @@ static dissector_table_t subdissector_message_table; /* WIMAX MAC Management message type info */ static const value_string mgt_msg_abbrv_vals[] = { - { MAC_MGMT_MSG_UCD, "UCD" }, - { MAC_MGMT_MSG_DCD, "DCD" }, - { MAC_MGMT_MSG_DL_MAP, "DL-MAP" }, - { MAC_MGMT_MSG_UL_MAP, "UL-MAP" }, - { MAC_MGMT_MSG_RNG_REQ, "RNG-REQ" }, - { MAC_MGMT_MSG_RNG_RSP, "RNG-RSP" }, - { MAC_MGMT_MSG_REG_REQ, "REG-REQ" }, - { MAC_MGMT_MSG_REG_RSP, "REG-RSP" }, - { 8, "Reserved8" }, - { MAC_MGMT_MSG_PKM_REQ, "PKM-REQ" }, - { MAC_MGMT_MSG_PKM_RSP, "PKM-RSP" }, - { MAC_MGMT_MSG_DSA_REQ, "DSA-REQ" }, - { MAC_MGMT_MSG_DSA_RSP, "DSA-RSP" }, - { MAC_MGMT_MSG_DSA_ACK, "DSA-ACK" }, - { MAC_MGMT_MSG_DSC_REQ, "DSC-REQ" }, - { MAC_MGMT_MSG_DSC_RSP, "DSC-RSP" }, - { MAC_MGMT_MSG_DSC_ACK, "DSC-ACK" }, - { MAC_MGMT_MSG_DSD_REQ, "DSD-REQ" }, - { MAC_MGMT_MSG_DSD_RSP, "DSD-RSP" }, - { 19, "Reserved19" }, - { 20, "Reserved20" }, - { MAC_MGMT_MSG_MCA_REQ, "MCA-REQ" }, - { MAC_MGMT_MSG_MCA_RSP, "MCA-RSP" }, - { MAC_MGMT_MSG_DBPC_REQ, "DBPC-REQ" }, - { MAC_MGMT_MSG_DBPC_RSP, "DBPC-RSP" }, - { MAC_MGMT_MSG_RES_CMD, "RES-CMD" }, - { MAC_MGMT_MSG_SBC_REQ, "SBC-REQ" }, - { MAC_MGMT_MSG_SBC_RSP, "SBC-RSP" }, - { MAC_MGMT_MSG_CLK_CMP, "CLK-CMP" }, - { MAC_MGMT_MSG_DREG_CMD, "DREG-CMD" }, - { MAC_MGMT_MSG_DSX_RVD, "DSX-RVD" }, - { MAC_MGMT_MSG_TFTP_CPLT, "TFTP-CPLT" }, - { MAC_MGMT_MSG_TFTP_RSP, "TFTP-RSP" }, - { MAC_MGMT_MSG_ARQ_FEEDBACK, "ARQ-FEEDBACK" }, - { MAC_MGMT_MSG_ARQ_DISCARD, "ARQ-DISCARD" }, - { MAC_MGMT_MSG_ARQ_RESET, "ARQ-RESET" }, - { MAC_MGMT_MSG_REP_REQ, "REP-REQ" }, - { MAC_MGMT_MSG_REP_RSP, "REP-RSP" }, - { MAC_MGMT_MSG_FPC, "FPC" }, - { MAC_MGMT_MSG_MSH_NCFG, "MSH-NCFG" }, - { MAC_MGMT_MSG_MSH_NENT, "MSH-NENT" }, - { MAC_MGMT_MSG_MSH_DSCH, "MSH-DSCH" }, - { MAC_MGMT_MSG_MSH_CSCH, "MSH-CSCH" }, - { MAC_MGMT_MSG_MSH_CSCF, "MSH-CSCF" }, - { MAC_MGMT_MSG_AAS_FBCK_REQ, "AAS-FBCK_REQ" }, - { MAC_MGMT_MSG_AAS_FBCK_RSP, "AAS-FBCK_RSP" }, - { MAC_MGMT_MSG_AAS_BEAM_SELECT, "AAS-BEAM_SELECT" }, - { MAC_MGMT_MSG_AAS_BEAM_REQ, "AAS-BEAM_REQ" }, - { MAC_MGMT_MSG_AAS_BEAM_RSP, "AAS-BEAM_RSP" }, - { MAC_MGMT_MSG_DREG_REQ, "DREG-REQ" }, - { MAC_MGMT_MSG_MOB_SLP_REQ, "MOB-SLP-REQ" }, - { MAC_MGMT_MSG_MOB_SLP_RSP, "MOB-SLP-RSP" }, - { MAC_MGMT_MSG_MOB_TRF_IND, "MOB-TRF-IND" }, - { MAC_MGMT_MSG_MOB_NBR_ADV, "MOB-NBR-ADV" }, - { MAC_MGMT_MSG_MOB_SCN_REQ, "MOB-SCN-REQ" }, - { MAC_MGMT_MSG_MOB_SCN_RSP, "MOB-SCN-RSP" }, - { MAC_MGMT_MSG_MOB_BSHO_REQ, "MOB-BSHO-REQ" }, - { MAC_MGMT_MSG_MOB_MSHO_REQ, "MOB-MSHO-REQ" }, - { MAC_MGMT_MSG_MOB_BSHO_RSP, "MOB-BSHO-RSP" }, - { MAC_MGMT_MSG_MOB_HO_IND, "MOB-HO-IND" }, - { MAC_MGMT_MSG_MOB_SCN_REP, "MOB-SCN-REP" }, - { MAC_MGMT_MSG_MOB_PAG_ADV, "MOB-PAG-ADV" }, - { MAC_MGMT_MSG_MBS_MAP, "MBS-MAP" }, - { MAC_MGMT_MSG_PMC_REQ, "PMC-REQ" }, - { MAC_MGMT_MSG_PMC_RSP, "PMC-RSP" }, - { MAC_MGMT_MSG_PRC_LT_CTRL, "PRC-LT-CTRL" }, - { MAC_MGMT_MSG_MOB_ASC_REP, "MOB-ASC-REP" }, - - { 0, NULL } + { MAC_MGMT_MSG_UCD, "UCD" }, + { MAC_MGMT_MSG_DCD, "DCD" }, + { MAC_MGMT_MSG_DL_MAP, "DL-MAP" }, + { MAC_MGMT_MSG_UL_MAP, "UL-MAP" }, + { MAC_MGMT_MSG_RNG_REQ, "RNG-REQ" }, + { MAC_MGMT_MSG_RNG_RSP, "RNG-RSP" }, + { MAC_MGMT_MSG_REG_REQ, "REG-REQ" }, + { MAC_MGMT_MSG_REG_RSP, "REG-RSP" }, + { 8, "Reserved8" }, + { MAC_MGMT_MSG_PKM_REQ, "PKM-REQ" }, + { MAC_MGMT_MSG_PKM_RSP, "PKM-RSP" }, + { MAC_MGMT_MSG_DSA_REQ, "DSA-REQ" }, + { MAC_MGMT_MSG_DSA_RSP, "DSA-RSP" }, + { MAC_MGMT_MSG_DSA_ACK, "DSA-ACK" }, + { MAC_MGMT_MSG_DSC_REQ, "DSC-REQ" }, + { MAC_MGMT_MSG_DSC_RSP, "DSC-RSP" }, + { MAC_MGMT_MSG_DSC_ACK, "DSC-ACK" }, + { MAC_MGMT_MSG_DSD_REQ, "DSD-REQ" }, + { MAC_MGMT_MSG_DSD_RSP, "DSD-RSP" }, + { 19, "Reserved19" }, + { 20, "Reserved20" }, + { MAC_MGMT_MSG_MCA_REQ, "MCA-REQ" }, + { MAC_MGMT_MSG_MCA_RSP, "MCA-RSP" }, + { MAC_MGMT_MSG_DBPC_REQ, "DBPC-REQ" }, + { MAC_MGMT_MSG_DBPC_RSP, "DBPC-RSP" }, + { MAC_MGMT_MSG_RES_CMD, "RES-CMD" }, + { MAC_MGMT_MSG_SBC_REQ, "SBC-REQ" }, + { MAC_MGMT_MSG_SBC_RSP, "SBC-RSP" }, + { MAC_MGMT_MSG_CLK_CMP, "CLK-CMP" }, + { MAC_MGMT_MSG_DREG_CMD, "DREG-CMD" }, + { MAC_MGMT_MSG_DSX_RVD, "DSX-RVD" }, + { MAC_MGMT_MSG_TFTP_CPLT, "TFTP-CPLT" }, + { MAC_MGMT_MSG_TFTP_RSP, "TFTP-RSP" }, + { MAC_MGMT_MSG_ARQ_FEEDBACK, "ARQ-FEEDBACK" }, + { MAC_MGMT_MSG_ARQ_DISCARD, "ARQ-DISCARD" }, + { MAC_MGMT_MSG_ARQ_RESET, "ARQ-RESET" }, + { MAC_MGMT_MSG_REP_REQ, "REP-REQ" }, + { MAC_MGMT_MSG_REP_RSP, "REP-RSP" }, + { MAC_MGMT_MSG_FPC, "FPC" }, + { MAC_MGMT_MSG_MSH_NCFG, "MSH-NCFG" }, + { MAC_MGMT_MSG_MSH_NENT, "MSH-NENT" }, + { MAC_MGMT_MSG_MSH_DSCH, "MSH-DSCH" }, + { MAC_MGMT_MSG_MSH_CSCH, "MSH-CSCH" }, + { MAC_MGMT_MSG_MSH_CSCF, "MSH-CSCF" }, + { MAC_MGMT_MSG_AAS_FBCK_REQ, "AAS-FBCK_REQ" }, + { MAC_MGMT_MSG_AAS_FBCK_RSP, "AAS-FBCK_RSP" }, + { MAC_MGMT_MSG_AAS_BEAM_SELECT, "AAS-BEAM_SELECT" }, + { MAC_MGMT_MSG_AAS_BEAM_REQ, "AAS-BEAM_REQ" }, + { MAC_MGMT_MSG_AAS_BEAM_RSP, "AAS-BEAM_RSP" }, + { MAC_MGMT_MSG_DREG_REQ, "DREG-REQ" }, + { MAC_MGMT_MSG_MOB_SLP_REQ, "MOB-SLP-REQ" }, + { MAC_MGMT_MSG_MOB_SLP_RSP, "MOB-SLP-RSP" }, + { MAC_MGMT_MSG_MOB_TRF_IND, "MOB-TRF-IND" }, + { MAC_MGMT_MSG_MOB_NBR_ADV, "MOB-NBR-ADV" }, + { MAC_MGMT_MSG_MOB_SCN_REQ, "MOB-SCN-REQ" }, + { MAC_MGMT_MSG_MOB_SCN_RSP, "MOB-SCN-RSP" }, + { MAC_MGMT_MSG_MOB_BSHO_REQ, "MOB-BSHO-REQ" }, + { MAC_MGMT_MSG_MOB_MSHO_REQ, "MOB-MSHO-REQ" }, + { MAC_MGMT_MSG_MOB_BSHO_RSP, "MOB-BSHO-RSP" }, + { MAC_MGMT_MSG_MOB_HO_IND, "MOB-HO-IND" }, + { MAC_MGMT_MSG_MOB_SCN_REP, "MOB-SCN-REP" }, + { MAC_MGMT_MSG_MOB_PAG_ADV, "MOB-PAG-ADV" }, + { MAC_MGMT_MSG_MBS_MAP, "MBS-MAP" }, + { MAC_MGMT_MSG_PMC_REQ, "PMC-REQ" }, + { MAC_MGMT_MSG_PMC_RSP, "PMC-RSP" }, + { MAC_MGMT_MSG_PRC_LT_CTRL, "PRC-LT-CTRL" }, + { MAC_MGMT_MSG_MOB_ASC_REP, "MOB-ASC-REP" }, + + { 0, NULL } }; static value_string_ext mgt_msg_abbrv_vals_ext = VALUE_STRING_EXT_INIT(mgt_msg_abbrv_vals); @@ -364,3 +364,16 @@ void proto_reg_handoff_mac_mgmt_msg(void) if (mgt_msg_handle) dissector_add_uint( "wmx.mgmtmsg", MAC_MGMT_MSG_MOB_ASC_REP, mgt_msg_handle ); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c index f430300a92..2dd68c71d9 100644 --- a/plugins/wimax/msg_aas_beam.c +++ b/plugins/wimax/msg_aas_beam.c @@ -56,18 +56,18 @@ static gint ett_mac_mgmt_msg_aas_beam_rsp_decoder = -1; #ifdef OFDM static const value_string vals_report_types[] = { - {0, "BEAM_REP_IE"}, - {0, NULL} + {0, "BEAM_REP_IE"}, + {0, NULL} }; static const value_string vals_resolution_parameter[] = { - {0, "report every 4th subcarrier"}, - {1, "report every 8th subcarrier"}, - {2, "report every 16th subcarrier"}, - {3, "report every 32nd subcarrier"}, - {4, "report every 64th subcarrier"}, - {0, NULL} + {0, "report every 4th subcarrier"}, + {1, "report every 8th subcarrier"}, + {2, "report every 16th subcarrier"}, + {3, "report every 32nd subcarrier"}, + {4, "report every 64th subcarrier"}, + {0, NULL} }; #endif @@ -336,3 +336,16 @@ proto_reg_handoff_mac_mgmt_msg_aas_beam(void) aas_handle = create_dissector_handle(dissect_mac_mgmt_msg_aas_beam_select_decoder, proto_mac_mgmt_msg_aas_beam_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_AAS_BEAM_SELECT, aas_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/wimax/msg_clk_cmp.c index 31661f29a3..459654cdfd 100644 --- a/plugins/wimax/msg_clk_cmp.c +++ b/plugins/wimax/msg_clk_cmp.c @@ -147,3 +147,16 @@ proto_reg_handoff_mac_mgmt_msg_clk_cmp(void) handle = create_dissector_handle(dissect_mac_mgmt_msg_clk_cmp_decoder, proto_mac_mgmt_msg_clk_cmp_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_CLK_CMP, handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c index b2e2ab34f5..31af9959a9 100644 --- a/plugins/wimax/msg_dcd.c +++ b/plugins/wimax/msg_dcd.c @@ -129,23 +129,23 @@ static gint hf_dcd_invalid_tlv = -1; /* DCD DIUC messages (table 143) */ static const value_string diuc_msgs[] = { - {0, "Downlink Burst Profile 1"}, - {1, "Downlink Burst Profile 2"}, - {2, "Downlink Burst Profile 3"}, - {3, "Downlink Burst Profile 4"}, - {4, "Downlink Burst Profile 5"}, - {5, "Downlink Burst Profile 6"}, - {6, "Downlink Burst Profile 7"}, - {7, "Downlink Burst Profile 8"}, - {8, "Downlink Burst Profile 9"}, - {9, "Downlink Burst Profile 10"}, - {10, "Downlink Burst Profile 11"}, - {11, "Downlink Burst Profile 12"}, - {12, "Downlink Burst Profile 13"}, - {13, "Reserved"}, - {14, "Gap"}, - {15, "End of DL-MAP"}, - {0, NULL} + { 0, "Downlink Burst Profile 1"}, + { 1, "Downlink Burst Profile 2"}, + { 2, "Downlink Burst Profile 3"}, + { 3, "Downlink Burst Profile 4"}, + { 4, "Downlink Burst Profile 5"}, + { 5, "Downlink Burst Profile 6"}, + { 6, "Downlink Burst Profile 7"}, + { 7, "Downlink Burst Profile 8"}, + { 8, "Downlink Burst Profile 9"}, + { 9, "Downlink Burst Profile 10"}, + {10, "Downlink Burst Profile 11"}, + {11, "Downlink Burst Profile 12"}, + {12, "Downlink Burst Profile 13"}, + {13, "Reserved"}, + {14, "Gap"}, + {15, "End of DL-MAP"}, + {0, NULL} }; static const value_string vals_dcd_type[] = @@ -248,15 +248,15 @@ static const value_string vals_dcd_size_of_cqich_id[] = static const value_string vals_dcd_mac_version[] = { - {1, "Conformance with IEEE Std 802.16-2001"}, - {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, - {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, - {4, "Conformance with IEEE Std 802.16-2004"}, - {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, - {6, "Conformance with IEEE Std 802.16-2004, IEEE Std 802.16e-2005 and IEEE Std 802.16f-2005"}, - {7, "Conformance with IEEE Std 802.16-2004, IEEE Std 802.16e-2005, IEEE Std 802.16f-2005 and IEEE Std 802.16g-2007"}, - {8, "Conformance with IEEE Std 802.16-2009"}, - {9, "Conformance with IEEE Std 802.16-2009 and IEEE Std 802.16j-2009"}, + { 1, "Conformance with IEEE Std 802.16-2001"}, + { 2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, + { 3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, + { 4, "Conformance with IEEE Std 802.16-2004"}, + { 5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, + { 6, "Conformance with IEEE Std 802.16-2004, IEEE Std 802.16e-2005 and IEEE Std 802.16f-2005"}, + { 7, "Conformance with IEEE Std 802.16-2004, IEEE Std 802.16e-2005, IEEE Std 802.16f-2005 and IEEE Std 802.16g-2007"}, + { 8, "Conformance with IEEE Std 802.16-2009"}, + { 9, "Conformance with IEEE Std 802.16-2009 and IEEE Std 802.16j-2009"}, {10, "Reserved"}, {0, NULL} }; @@ -264,16 +264,16 @@ static const value_string vals_dcd_mac_version[] = /* table 363 */ static const value_string vals_dcd_burst_fec_ofdma[] = { - {0, "QPSK (CC) 1/2"}, - {1, "QPSK (CC) 3/4"}, - {2, "16-QAM (CC) 1/2"}, - {3, "16-QAM (CC) 3/4"}, - {4, "64-QAM (CC) 1/2"}, - {5, "64-QAM (CC) 2/3"}, - {6, "64-QAM (CC) 3/4"}, - {7, "QPSK (BTC) 1/2"}, - {8, "QPSK (BTC) 3/4 or 2/3"}, - {9, "16-QAM (BTC) 3/5"}, + { 0, "QPSK (CC) 1/2"}, + { 1, "QPSK (CC) 3/4"}, + { 2, "16-QAM (CC) 1/2"}, + { 3, "16-QAM (CC) 3/4"}, + { 4, "64-QAM (CC) 1/2"}, + { 5, "64-QAM (CC) 2/3"}, + { 6, "64-QAM (CC) 3/4"}, + { 7, "QPSK (BTC) 1/2"}, + { 8, "QPSK (BTC) 3/4 or 2/3"}, + { 9, "16-QAM (BTC) 3/5"}, {10, "16-QAM (BTC) 4/5"}, {11, "64-QAM (BTC) 2/3 or 5/8"}, {12, "64-QAM (BTC) 5/6 or 4/5"}, @@ -1261,3 +1261,16 @@ void proto_reg_handoff_mac_mgmt_msg_dcd(void) dcd_handle = create_dissector_handle(dissect_mac_mgmt_msg_dcd_decoder, proto_mac_mgmt_msg_dcd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DCD, dcd_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c index 16a7fb0832..1610e262b3 100644 --- a/plugins/wimax/msg_dlmap.c +++ b/plugins/wimax/msg_dlmap.c @@ -131,50 +131,50 @@ static gint ett_305 = -1; /* static gint ett_305_dl = -1; */ static gint ett_308a = -1; -#define DCD_DOWNLINK_BURST_PROFILE 1 -#define DCD_BS_EIRP 2 -#define DCD_FRAME_DURATION 3 -#define DCD_PHY_TYPE 4 -#define DCD_POWER_ADJUSTMENT 5 -#define DCD_CHANNEL_NR 6 -#define DCD_TTG 7 -#define DCD_RTG 8 -#define DCD_RSS 9 -#define DCD_CHANNEL_SWITCH_FRAME_NR 10 -#define DCD_FREQUENCY 12 -#define DCD_BS_ID 13 -#define DCD_FRAME_DURATION_CODE 14 -#define DCD_FRAME_NR 15 -#define DCD_SIZE_CQICH_ID 16 -#define DCD_H_ARQ_ACK_DELAY 17 +#define DCD_DOWNLINK_BURST_PROFILE 1 +#define DCD_BS_EIRP 2 +#define DCD_FRAME_DURATION 3 +#define DCD_PHY_TYPE 4 +#define DCD_POWER_ADJUSTMENT 5 +#define DCD_CHANNEL_NR 6 +#define DCD_TTG 7 +#define DCD_RTG 8 +#define DCD_RSS 9 +#define DCD_CHANNEL_SWITCH_FRAME_NR 10 +#define DCD_FREQUENCY 12 +#define DCD_BS_ID 13 +#define DCD_FRAME_DURATION_CODE 14 +#define DCD_FRAME_NR 15 +#define DCD_SIZE_CQICH_ID 16 +#define DCD_H_ARQ_ACK_DELAY 17 #define DCD_MAC_VERSION 148 #define DCD_RESTART_COUNT 154 -#define DCD_BURST_FREQUENCY 1 +#define DCD_BURST_FREQUENCY 1 #define DCD_BURST_FEC_CODE_TYPE 150 #define DCD_BURST_DIUC_EXIT_THRESHOLD 151 #define DCD_BURST_DIUC_ENTRY_THRESHOLD 152 #define DCD_BURST_TCS_ENABLE 153 -#define DCD_TLV_T_541_TYPE_FUNCTION_ACTION 1 -#define DCD_TLV_T542_TRIGGER_VALUE 2 -#define DCD_TLV_T_543_TRIGGER_AVERAGING_DURATION 3 -#define DCD_TLV_T_19_PERMUTATION_TYPE_FOR_BROADCAST_REGION_IN_HARQ_ZONE 19 -#define DCD_TLV_T_20_MAXIMUM_RETRANSMISSION 20 -#define DCD_TLV_T_21_DEFAULT_RSSI_AND_CINR_AVERAGING_PARAMETER 21 -#define DCD_TLV_T_22_DL_AMC_ALLOCATED_PHYSICAL_BANDS_BITMAP 22 -#define DCD_TLV_T_31_H_ADD_THRESHOLD 31 -#define DCD_TLV_T_32_H_DELETE_THRESHOLD 32 -#define DCD_TLV_T_33_ASR 33 -#define DCD_TLV_T_34_DL_REGION_DEFINITION 34 -#define DCD_TLV_T_35_PAGING_GROUP_ID 35 -#define DCD_TLV_T_36_TUSC1_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP 36 -#define DCD_TLV_T_37_TUSC2_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP 37 -#define DCD_TLV_T_45_PAGING_INTERVAL_LENGTH 45 -#define DCD_TLV_T_50_HO_TYPE_SUPPORT 50 -#define DCD_TLV_T_51_HYSTERSIS_MARGIN 51 -#define DCD_TLV_T_52_TIME_TO_TRIGGER_DURATION 52 -#define DCD_TLV_T_54_TRIGGER 54 +#define DCD_TLV_T_541_TYPE_FUNCTION_ACTION 1 +#define DCD_TLV_T542_TRIGGER_VALUE 2 +#define DCD_TLV_T_543_TRIGGER_AVERAGING_DURATION 3 +#define DCD_TLV_T_19_PERMUTATION_TYPE_FOR_BROADCAST_REGION_IN_HARQ_ZONE 19 +#define DCD_TLV_T_20_MAXIMUM_RETRANSMISSION 20 +#define DCD_TLV_T_21_DEFAULT_RSSI_AND_CINR_AVERAGING_PARAMETER 21 +#define DCD_TLV_T_22_DL_AMC_ALLOCATED_PHYSICAL_BANDS_BITMAP 22 +#define DCD_TLV_T_31_H_ADD_THRESHOLD 31 +#define DCD_TLV_T_32_H_DELETE_THRESHOLD 32 +#define DCD_TLV_T_33_ASR 33 +#define DCD_TLV_T_34_DL_REGION_DEFINITION 34 +#define DCD_TLV_T_35_PAGING_GROUP_ID 35 +#define DCD_TLV_T_36_TUSC1_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP 36 +#define DCD_TLV_T_37_TUSC2_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP 37 +#define DCD_TLV_T_45_PAGING_INTERVAL_LENGTH 45 +#define DCD_TLV_T_50_HO_TYPE_SUPPORT 50 +#define DCD_TLV_T_51_HYSTERSIS_MARGIN 51 +#define DCD_TLV_T_52_TIME_TO_TRIGGER_DURATION 52 +#define DCD_TLV_T_54_TRIGGER 54 #define DCD_TLV_T_153_DOWNLINK_BURST_PROFILE_FOR_MULTIPLE_FEC_TYPES 153 #define DL_MAP_NCT_PMP 0 @@ -2885,3 +2885,16 @@ void proto_reg_handoff_mac_mgmt_msg_dlmap(void) dlmap_handle = create_dissector_handle(dissect_mac_mgmt_msg_dlmap_decoder, proto_mac_mgmt_msg_dlmap_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DL_MAP, dlmap_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dreg.c b/plugins/wimax/msg_dreg.c index 16e7956c41..d4b2f265bf 100644 --- a/plugins/wimax/msg_dreg.c +++ b/plugins/wimax/msg_dreg.c @@ -525,3 +525,16 @@ proto_reg_handoff_mac_mgmt_msg_dreg(void) dreg_handle = create_dissector_handle(dissect_mac_mgmt_msg_dreg_cmd_decoder, proto_mac_mgmt_msg_dreg_cmd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DREG_CMD, dreg_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dsa.c b/plugins/wimax/msg_dsa.c index a92f983eea..4f7dc54272 100644 --- a/plugins/wimax/msg_dsa.c +++ b/plugins/wimax/msg_dsa.c @@ -179,3 +179,16 @@ proto_reg_handoff_mac_mgmt_msg_dsa (void) dsa_handle = create_dissector_handle(dissect_mac_mgmt_msg_dsa_ack_decoder, proto_mac_mgmt_msg_dsa_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSA_ACK, dsa_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index 5024ab88bf..45cb220507 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -274,3 +274,16 @@ proto_reg_handoff_mac_mgmt_msg_dsd(void) dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSD_RSP, dsd_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_dsx_rvd.c b/plugins/wimax/msg_dsx_rvd.c index 72543b5252..7f6ac7baaf 100644 --- a/plugins/wimax/msg_dsx_rvd.c +++ b/plugins/wimax/msg_dsx_rvd.c @@ -104,3 +104,16 @@ proto_reg_handoff_mac_mgmt_msg_dsx_rvd(void) handle = create_dissector_handle(dissect_mac_mgmt_msg_dsx_rvd_decoder, proto_mac_mgmt_msg_dsx_rvd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSX_RVD, handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_fpc.c b/plugins/wimax/msg_fpc.c index 6db5de32a5..a47c15edb6 100644 --- a/plugins/wimax/msg_fpc.c +++ b/plugins/wimax/msg_fpc.c @@ -165,3 +165,16 @@ proto_reg_handoff_mac_mgmt_msg_fpc(void) fpc_handle = create_dissector_handle(dissect_mac_mgmt_msg_fpc_decoder, proto_mac_mgmt_msg_fpc_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_FPC, fpc_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_pkm.c b/plugins/wimax/msg_pkm.c index 8924fb5f4d..140fee2b01 100644 --- a/plugins/wimax/msg_pkm.c +++ b/plugins/wimax/msg_pkm.c @@ -47,13 +47,13 @@ static gint ett_mac_mgmt_msg_pkm_rsp_decoder = -1; static const value_string vals_pkm_msg_code[] = { - {3, "SA ADD"}, - {4, "Auth Request"}, - {5, "Auth Reply"}, - {6, "Auth Reject"}, - {7, "Key Request"}, - {8, "Key Reply"}, - {9, "Key Reject"}, + { 3, "SA ADD"}, + { 4, "Auth Request"}, + { 5, "Auth Reply"}, + { 6, "Auth Reject"}, + { 7, "Key Request"}, + { 8, "Key Reply"}, + { 9, "Key Reject"}, {10, "Auth Invalid"}, {11, "TEK Invalid"}, {12, "Auth Info"}, @@ -173,3 +173,16 @@ void proto_reg_handoff_mac_mgmt_msg_pkm(void) mac_mgmt_msg_pkm_rsp_handle = create_dissector_handle(dissect_mac_mgmt_msg_pkm_rsp_decoder, proto_mac_mgmt_msg_pkm_decoder); dissector_add_uint( "wmx.mgmtmsg", MAC_MGMT_MSG_PKM_RSP, mac_mgmt_msg_pkm_rsp_handle ); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/wimax/msg_prc_lt_ctrl.c index 37d5fd25a3..824f4afc4d 100644 --- a/plugins/wimax/msg_prc_lt_ctrl.c +++ b/plugins/wimax/msg_prc_lt_ctrl.c @@ -48,9 +48,9 @@ static gint hf_prc_lt_ctrl_precoding_delay = -1; /* static gint hf_prc_lt_ctrl_invalid_tlv = -1; */ static const value_string vals_turn_on[] = { - {0, "Turn off"}, - {1, "Turn on"}, - {0, NULL} + {0, "Turn off"}, + {1, "Turn on"}, + {0, NULL} }; @@ -135,3 +135,16 @@ proto_reg_handoff_mac_mgmt_msg_prc_lt_ctrl(void) handle = create_dissector_handle(dissect_mac_mgmt_msg_prc_lt_ctrl_decoder, proto_mac_mgmt_msg_prc_lt_ctrl_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_PRC_LT_CTRL, handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c index 079327f951..e2ac0667a2 100644 --- a/plugins/wimax/msg_reg_rsp.c +++ b/plugins/wimax/msg_reg_rsp.c @@ -62,14 +62,14 @@ static gint hf_reg_invalid_tlv = -1; static gint hf_reg_rsp_new_cid_after_ho = -1; static gint hf_reg_rsp_service_flow_id = -1; static gint hf_reg_rsp_system_resource_retain_time = -1; -static gint hf_reg_total_provisioned_sf = -1; +static gint hf_reg_total_provisioned_sf = -1; /* STRING RESOURCES */ static const value_string vals_reg_rsp_status [] = { - {0, "OK"}, - {1, "Message authentication failure"}, - {0, NULL} + {0, "OK"}, + {1, "Message authentication failure"}, + {0, NULL} }; @@ -366,3 +366,16 @@ void proto_reg_handoff_mac_mgmt_msg_reg_rsp(void) reg_rsp_handle = create_dissector_handle(dissect_mac_mgmt_msg_reg_rsp_decoder, proto_mac_mgmt_msg_reg_rsp_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_REG_RSP, reg_rsp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_rep.c b/plugins/wimax/msg_rep.c index 780f68f973..98f3b6b58b 100644 --- a/plugins/wimax/msg_rep.c +++ b/plugins/wimax/msg_rep.c @@ -1559,3 +1559,16 @@ proto_reg_handoff_mac_mgmt_msg_rep(void) rep_handle = create_dissector_handle(dissect_mac_mgmt_msg_rep_rsp_decoder, proto_mac_mgmt_msg_rep_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_REP_RSP, rep_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/wimax/msg_res_cmd.c index 5bd49a1fd1..653ee96100 100644 --- a/plugins/wimax/msg_res_cmd.c +++ b/plugins/wimax/msg_res_cmd.c @@ -151,3 +151,16 @@ proto_reg_handoff_mac_mgmt_msg_res_cmd(void) handle = create_dissector_handle(dissect_mac_mgmt_msg_res_cmd_decoder, proto_mac_mgmt_msg_res_cmd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_RES_CMD, handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index eef0839fe3..a04c3e205e 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -113,8 +113,8 @@ static gint hf_rng_invalid_tlv = -1; /* STRING RESOURCES */ static const true_false_string tfs_rng_rsp_aas_broadcast = { - "SS shall not issue contention-based Bandwidth Request", - "SS may issue contention-based Bandwidth Request" + "SS shall not issue contention-based Bandwidth Request", + "SS may issue contention-based Bandwidth Request" }; static const true_false_string tfs_rng_rsp_resource_retain_flag = { @@ -123,11 +123,11 @@ static const true_false_string tfs_rng_rsp_resource_retain_flag = { }; static const value_string vals_rng_rsp_ranging_status[] = { - {1, "continue"}, - {2, "abort"}, - {3, "success"}, - {4, "rerange"}, - {0, NULL} + {1, "continue"}, + {2, "abort"}, + {3, "success"}, + {4, "rerange"}, + {0, NULL} }; static const value_string vals_rng_rsp_level_of_service[] = { @@ -963,3 +963,16 @@ void proto_reg_handoff_mac_mgmt_msg_rng_rsp(void) reg_rsp_handle = find_dissector("mac_mgmt_msg_reg_rsp_handler"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c index 632ce64afd..b26f89793f 100644 --- a/plugins/wimax/msg_sbc.c +++ b/plugins/wimax/msg_sbc.c @@ -294,24 +294,24 @@ static gint hf_sbc_invalid_tlv = -1; static const true_false_string tfs_sbc_bw_alloc_support_duplex = { - "Full-Duplex", - "Half-Duplex" + "Full-Duplex", + "Half-Duplex" }; #if 0 static const value_string vals_sbc_mac_pdu_fsn[] = { - {0, "Only 11-bit FSN values are supported"}, - {1, "Only 3-bit FSN values are supported"}, - {0, NULL} + {0, "Only 11-bit FSN values are supported"}, + {1, "Only 3-bit FSN values are supported"}, + {0, NULL} }; #endif #if 0 static const true_false_string tfs_sbc_mac_pdu_fsn = { - "Only 3-bit FSN values are supported", - "Only 11-bit FSN values are supported" + "Only 3-bit FSN values are supported", + "Only 11-bit FSN values are supported" }; #endif @@ -319,248 +319,248 @@ static const true_false_string tfs_sbc_mac_pdu_fsn = /* DCD DIUC messages (table 143) */ static const value_string diuc_msgs[] = { - { 0, "Downlink Burst Profile 1" }, - { 1, "Downlink Burst Profile 2" }, - { 2, "Downlink Burst Profile 3" }, - { 3, "Downlink Burst Profile 4" }, - { 4, "Downlink Burst Profile 5" }, - { 5, "Downlink Burst Profile 6" }, - { 6, "Downlink Burst Profile 7" }, - { 7, "Downlink Burst Profile 8" }, - { 8, "Downlink Burst Profile 9" }, - { 9, "Downlink Burst Profile 10" }, - { 10, "Downlink Burst Profile 11" }, - { 11, "Downlink Burst Profile 12" }, - { 12, "Downlink Burst Profile 13" }, - { 13, "Reserved" }, - { 14, "Gap" }, - { 15, "End of DL-MAP" }, - {0, NULL} + { 0, "Downlink Burst Profile 1" }, + { 1, "Downlink Burst Profile 2" }, + { 2, "Downlink Burst Profile 3" }, + { 3, "Downlink Burst Profile 4" }, + { 4, "Downlink Burst Profile 5" }, + { 5, "Downlink Burst Profile 6" }, + { 6, "Downlink Burst Profile 7" }, + { 7, "Downlink Burst Profile 8" }, + { 8, "Downlink Burst Profile 9" }, + { 9, "Downlink Burst Profile 10" }, + { 10, "Downlink Burst Profile 11" }, + { 11, "Downlink Burst Profile 12" }, + { 12, "Downlink Burst Profile 13" }, + { 13, "Reserved" }, + { 14, "Gap" }, + { 15, "End of DL-MAP" }, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_type[] = { - {0, "CINR metric"}, - {1, "RSSI metric"}, - {2, "RTD metric"}, - {3, "Reserved"}, - {0, NULL} + {0, "CINR metric"}, + {1, "RSSI metric"}, + {2, "RTD metric"}, + {3, "Reserved"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_function[] = { - {0, "Reserved"}, - {1, "Metric of neighbor BS is greater than absolute value"}, - {2, "Metric of neighbor BS is less than absolute value"}, - {3, "Metric of neighbor BS is greater than serving BS metric by relative value"}, - {4, "Metric of neighbor BS is less than serving BS metric by relative value"}, - {5, "Metric of serving BS greater than absolute value"}, - {6, "Metric of serving BS less than absolute value"}, - {7, "Reserved"}, - {0, NULL} + {0, "Reserved"}, + {1, "Metric of neighbor BS is greater than absolute value"}, + {2, "Metric of neighbor BS is less than absolute value"}, + {3, "Metric of neighbor BS is greater than serving BS metric by relative value"}, + {4, "Metric of neighbor BS is less than serving BS metric by relative value"}, + {5, "Metric of serving BS greater than absolute value"}, + {6, "Metric of serving BS less than absolute value"}, + {7, "Reserved"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_action[] = { - {0, "Reserved"}, - {1, "Respond on trigger with MOB_SCN-REP after the end of each scanning interval"}, - {2, "Respond on trigger with MOB_MSH-REQ"}, - {3, "On trigger, MS starts neighbor BS scanning process by sending MOB_SCN-REQ"}, - {4, "Reserved"}, - {0, NULL} + {0, "Reserved"}, + {1, "Respond on trigger with MOB_SCN-REP after the end of each scanning interval"}, + {2, "Respond on trigger with MOB_MSH-REQ"}, + {3, "On trigger, MS starts neighbor BS scanning process by sending MOB_SCN-REQ"}, + {4, "Reserved"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_power_adjustmnt[] = { - {0, "Preserve Peak Power"}, - {1, "Preserve Mean Power"}, - {0, NULL} + {0, "Preserve Peak Power"}, + {1, "Preserve Mean Power"}, + {0, NULL} }; #endif #if 0 static const true_false_string tfs_sbc_power_adjustment = { - "Preserve Mean Power", - "Preserve Peak Power" + "Preserve Mean Power", + "Preserve Peak Power" }; #endif #if 0 static const value_string vals_reg_rsp_status[] = { - {0, "OK"}, - {1, "Message authentication failure"}, - {0, NULL} + {0, "OK"}, + {1, "Message authentication failure"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_burst_tcs[] = { - {0, "TCS disabled"}, - {1, "TCS enabled"}, - {0, NULL} + {0, "TCS disabled"}, + {1, "TCS enabled"}, + {0, NULL} }; #endif #if 0 static const true_false_string tfs_sbc_burst_tcs = { - "TCS enabled", - "TCS disabled" + "TCS enabled", + "TCS disabled" }; #endif #if 0 static const value_string vals_sbc_frame_duration[] = { - {0, "2.5"}, - {1, "4"}, - {2, "5"}, - {3, "8"}, - {4, "10"}, - {5, "12.5"}, - {6, "20"}, - {0, NULL} + {0, "2.5"}, + {1, "4"}, + {2, "5"}, + {3, "8"}, + {4, "10"}, + {5, "12.5"}, + {6, "20"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_mac_version[] = { - {1, "Conformance with IEEE Std 802.16-2001"}, - {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, - {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, - {4, "Conformance with IEEE Std 802.16-2004"}, - {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, - {6, "reserved"}, - {0, NULL} + {1, "Conformance with IEEE Std 802.16-2001"}, + {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, + {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, + {4, "Conformance with IEEE Std 802.16-2004"}, + {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, + {6, "reserved"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_burst_fec[] = { - {0, "QPSK (CC) 1/2"}, - {1, "QPSK (CC) 3/4"}, - {2, "16-QAM (CC) 1/2"}, - {3, "16-QAM (CC) 3/4"}, - {4, "64-QAM (CC) 1/2"}, - {5, "64-QAM (CC) 2/3"}, - {6, "64-QAM (CC) 3/4"}, - {7, "QPSK (BTC) 1/2"}, - {8, "QPSK (BTC) 3/4 or 2/3"}, - {9, "16-QAM (BTC) 3/5"}, - {10, "16-QAM (BTC) 4/5"}, - {11, "64-QAM (BTC) 2/3 or 5/8"}, - {12, "64-QAM (BTC) 5/6 or 4/5"}, - {13, "QPSK (CTC) 1/2"}, - {14, "Reserved"}, - {15, "QPSK (CTC) 3/4"}, - {16, "16-QAM (CTC) 1/2"}, - {17, "16-QAM (CTC) 3/4"}, - {18, "64-QAM (CTC) 1/2"}, - {19, "64-QAM (CTC) 2/3"}, - {20, "64-QAM (CTC) 3/4"}, - {21, "64-QAM (CTC) 5/6"}, - {22, "QPSK (ZT CC) 1/2"}, - {23, "QPSK (ZT CC) 3/4"}, - {24, "16-QAM (ZT CC) 1/2"}, - {25, "16-QAM (ZT CC) 3/4"}, - {26, "64-QAM (ZT CC) 1/2"}, - {27, "64-QAM (ZT CC) 2/3"}, - {28, "64-QAM (ZT CC) 3/4"}, - {29, "QPSK (LDPC) 1/2"}, - {30, "QPSK (LDPC) 2/3 A code"}, - {31, "16-QAM (LDPC) 3/4 A code"}, - {32, "16-QAM (LDPC) 1/2"}, - {33, "16-QAM (LDPC) 2/3 A code"}, - {34, "16-QAM (LDPC) 3/4 A code"}, - {35, "64-QAM (LDPC) 1/2"}, - {36, "64-QAM (LDPC) 2/3 A code"}, - {37, "64-QAM (LDPC) 3/4 A code"}, - {38, "QPSK (LDPC) 2/3 B code"}, - {39, "QPSK (LDPC) 3/4 B code"}, - {40, "16-QAM (LDPC) 2/3 B code"}, - {41, "16-QAM (LDPC) 3/4 B code"}, - {42, "64-QAM (LDPC) 2/3 B code"}, - {43, "64-QAM (LDPC) 3/4 B code"}, - {44, "QPSK (CC with optional interleaver) 1/2"}, - {45, "QPSK (CC with optional interleaver) 3/4"}, - {46, "16-QAM (CC with optional interleaver) 1/2"}, - {47, "16-QAM (CC optional interleaver) 0%00"}, - {48, "64-QAM (CC with optional interleaver) 2/3"}, - {49, "64-QAM (CC with optional interleaver) 3/4"}, - {50, "QPSK (LDPC) 5/6"}, - {51, "16-QAM (LDPC) 5/6"}, - {52, "64-QAM (LDPC) 5/6"}, - {0, NULL} + { 0, "QPSK (CC) 1/2"}, + { 1, "QPSK (CC) 3/4"}, + { 2, "16-QAM (CC) 1/2"}, + { 3, "16-QAM (CC) 3/4"}, + { 4, "64-QAM (CC) 1/2"}, + { 5, "64-QAM (CC) 2/3"}, + { 6, "64-QAM (CC) 3/4"}, + { 7, "QPSK (BTC) 1/2"}, + { 8, "QPSK (BTC) 3/4 or 2/3"}, + { 9, "16-QAM (BTC) 3/5"}, + {10, "16-QAM (BTC) 4/5"}, + {11, "64-QAM (BTC) 2/3 or 5/8"}, + {12, "64-QAM (BTC) 5/6 or 4/5"}, + {13, "QPSK (CTC) 1/2"}, + {14, "Reserved"}, + {15, "QPSK (CTC) 3/4"}, + {16, "16-QAM (CTC) 1/2"}, + {17, "16-QAM (CTC) 3/4"}, + {18, "64-QAM (CTC) 1/2"}, + {19, "64-QAM (CTC) 2/3"}, + {20, "64-QAM (CTC) 3/4"}, + {21, "64-QAM (CTC) 5/6"}, + {22, "QPSK (ZT CC) 1/2"}, + {23, "QPSK (ZT CC) 3/4"}, + {24, "16-QAM (ZT CC) 1/2"}, + {25, "16-QAM (ZT CC) 3/4"}, + {26, "64-QAM (ZT CC) 1/2"}, + {27, "64-QAM (ZT CC) 2/3"}, + {28, "64-QAM (ZT CC) 3/4"}, + {29, "QPSK (LDPC) 1/2"}, + {30, "QPSK (LDPC) 2/3 A code"}, + {31, "16-QAM (LDPC) 3/4 A code"}, + {32, "16-QAM (LDPC) 1/2"}, + {33, "16-QAM (LDPC) 2/3 A code"}, + {34, "16-QAM (LDPC) 3/4 A code"}, + {35, "64-QAM (LDPC) 1/2"}, + {36, "64-QAM (LDPC) 2/3 A code"}, + {37, "64-QAM (LDPC) 3/4 A code"}, + {38, "QPSK (LDPC) 2/3 B code"}, + {39, "QPSK (LDPC) 3/4 B code"}, + {40, "16-QAM (LDPC) 2/3 B code"}, + {41, "16-QAM (LDPC) 3/4 B code"}, + {42, "64-QAM (LDPC) 2/3 B code"}, + {43, "64-QAM (LDPC) 3/4 B code"}, + {44, "QPSK (CC with optional interleaver) 1/2"}, + {45, "QPSK (CC with optional interleaver) 3/4"}, + {46, "16-QAM (CC with optional interleaver) 1/2"}, + {47, "16-QAM (CC optional interleaver) 0%00"}, + {48, "64-QAM (CC with optional interleaver) 2/3"}, + {49, "64-QAM (CC with optional interleaver) 3/4"}, + {50, "QPSK (LDPC) 5/6"}, + {51, "16-QAM (LDPC) 5/6"}, + {52, "64-QAM (LDPC) 5/6"}, + {0, NULL} }; #endif #if 0 static const value_string vals_sbc_permutation_type[] = { - {0, "PUSC" }, - {1, "FUSC" }, - {2, "optional FUSC"}, - {3, "AMC"}, - {0, NULL} + {0, "PUSC" }, + {1, "FUSC" }, + {2, "optional FUSC"}, + {3, "AMC"}, + {0, NULL} }; #endif static const value_string vals_sbc_harq_parameters_set[] = { - {0, "HARQ set 1"}, - {1, "HARQ set 2"}, - {2, "HARQ set 3"}, - {3, "HARQ set 4"}, - {4, "HARQ set 5"}, - {5, "Reserved"}, - {0, NULL} + {0, "HARQ set 1"}, + {1, "HARQ set 2"}, + {2, "HARQ set 3"}, + {3, "HARQ set 4"}, + {4, "HARQ set 5"}, + {5, "Reserved"}, + {0, NULL} }; static const true_false_string tfs_supported = { - "supported", - "not supported" + "supported", + "not supported" }; static const true_false_string tfs_yes_no_sbc = { - "yes", - "no" + "yes", + "no" }; static const value_string vals_sounding_rsp_time_cap_codings[] = { - {0, "0.5ms" }, - {1, "0.75ms" }, - {2, "1ms"}, - {3, "1.25ms"}, - {4, "1.5ms"}, - {5, "min(2, Next Frame)"}, - {6, "min(5, Next Frame)"}, - {7, "Next Frame"}, - {0, NULL} + {0, "0.5ms" }, + {1, "0.75ms" }, + {2, "1ms"}, + {3, "1.25ms"}, + {4, "1.5ms"}, + {5, "min(2, Next Frame)"}, + {6, "min(5, Next Frame)"}, + {7, "Next Frame"}, + {0, NULL} }; static const value_string vals_sbc_sdma_str[ ] = { - {0, "no support"}, - {1, "support SDMA pilot patterns #A and #B"}, - {2, "support all SDMA pilot patterns"}, - {3, "reserved"}, - {0, NULL} + {0, "no support"}, + {1, "support SDMA pilot patterns #A and #B"}, + {2, "support all SDMA pilot patterns"}, + {3, "reserved"}, + {0, NULL} }; @@ -2791,3 +2791,16 @@ proto_reg_handoff_mac_mgmt_msg_sbc(void) dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_SBC_RSP, sbc_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c index 38c7b903e3..1d4d7ccfa8 100644 --- a/plugins/wimax/msg_ucd.c +++ b/plugins/wimax/msg_ucd.c @@ -135,16 +135,16 @@ static const value_string vals_dcd_burst_tcs[] = static const value_string vals_dcd_burst_fec[] = { - {0, "QPSK (CC) 1/2"}, - {1, "QPSK (CC) 3/4"}, - {2, "16-QAM (CC) 1/2"}, - {3, "16-QAM (CC) 3/4"}, - {4, "64-QAM (CC) 1/2"}, - {5, "64-QAM (CC) 2/3"}, - {6, "64-QAM (CC) 3/4"}, - {7, "QPSK (BTC) 1/2"}, - {8, "QPSK (BTC) 3/4 or 2/3"}, - {9, "16-QAM (BTC) 3/5"}, + { 0, "QPSK (CC) 1/2"}, + { 1, "QPSK (CC) 3/4"}, + { 2, "16-QAM (CC) 1/2"}, + { 3, "16-QAM (CC) 3/4"}, + { 4, "64-QAM (CC) 1/2"}, + { 5, "64-QAM (CC) 2/3"}, + { 6, "64-QAM (CC) 3/4"}, + { 7, "QPSK (BTC) 1/2"}, + { 8, "QPSK (BTC) 3/4 or 2/3"}, + { 9, "16-QAM (BTC) 3/5"}, {10, "16-QAM (BTC) 4/5"}, {11, "64-QAM (BTC) 2/3 or 5/8"}, {12, "64-QAM (BTC) 5/6 or 4/5"}, @@ -1221,3 +1221,16 @@ void proto_reg_handoff_mac_mgmt_msg_ucd(void) ucd_handle = create_dissector_handle(dissect_mac_mgmt_msg_ucd_decoder, proto_mac_mgmt_msg_ucd_decoder); dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_UCD, ucd_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/wimax/wimax_cdma_code_decoder.c index f6a6beb4ad..f99dddb88f 100644 --- a/plugins/wimax/wimax_cdma_code_decoder.c +++ b/plugins/wimax/wimax_cdma_code_decoder.c @@ -95,7 +95,7 @@ void proto_register_wimax_cdma(void) } }; - /* Setup protocol subtree array */ + /* Setup protocol subtree array */ static gint *ett[] = { &ett_wimax_cdma_code_decoder, @@ -114,3 +114,16 @@ void proto_register_wimax_cdma(void) register_dissector("wimax_cdma_code_burst_handler", dissect_wimax_cdma_code_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c index 625fe8110f..c248fd58f4 100644 --- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c @@ -80,72 +80,72 @@ static gint ett_wimax_extension_type_ie_decoder = -1; /* New Format Indications */ static const true_false_string tfs_indication = { - "New format", - "No new format" + "New format", + "No new format" }; /* Prefixes */ static const true_false_string tfs_prefix = { - "Enable HARQ", - "Temporary Disable HARQ" + "Enable HARQ", + "Temporary Disable HARQ" }; /* CQICH Indicator */ static const true_false_string tfs_cqich_ind = { - "With CQICH Control IE", - "No CQICH Control IE" + "With CQICH Control IE", + "No CQICH Control IE" }; /* CID types */ static const value_string vals_cid_types[] = { - { 0, "Normal CID" }, - { 1, "RCID11 (default)" }, - { 2, "RCID7" }, - { 3, "RCID3" }, - { 0, NULL } + { 0, "Normal CID" }, + { 1, "RCID11 (default)" }, + { 2, "RCID7" }, + { 3, "RCID3" }, + { 0, NULL } }; /* Subchannel Types */ static const value_string vals_subchannel_types[] = { - { 0, "Default Type" }, - { 1, "1 bin x 6 symbols Type" }, - { 2, "2 bin x 3 symbols Type" }, - { 3, "3 bin x 2 symbols Type" }, - { 0, NULL } + { 0, "Default Type" }, + { 1, "1 bin x 6 symbols Type" }, + { 2, "2 bin x 3 symbols Type" }, + { 3, "3 bin x 2 symbols Type" }, + { 0, NULL } }; /* Max Logical Bands */ static const value_string vals_max_logical_bands[] = { - { 0, "3 Bands" }, - { 1, "6 Bands" }, - { 2, "12 Bands (default)" }, - { 3, "24 Bands" }, - { 0, NULL } + { 0, "3 Bands" }, + { 1, "6 Bands" }, + { 2, "12 Bands (default)" }, + { 3, "24 Bands" }, + { 0, NULL } }; /* Repetition Coding Indications */ static const value_string rep_msgs[] = { - { 0, "No Repetition Coding" }, - { 1, "Repetition Coding of 2 Used" }, - { 2, "Repetition Coding of 4 Used" }, - { 3, "Repetition Coding of 6 Used" }, - { 0, NULL } + { 0, "No Repetition Coding" }, + { 1, "Repetition Coding of 2 Used" }, + { 2, "Repetition Coding of 4 Used" }, + { 3, "Repetition Coding of 6 Used" }, + { 0, NULL } }; /* Repetition Coding Indications */ static const value_string vals_allocation_modes[] = { - { 0, "Same Number Of Subchannels For The Selected Bands" }, - { 1, "Different Same Number Of Subchannels For The Selected Bands" }, - { 2, "Total Number Of Subchannels For The Selected Bands Determined by Nsch Code and Nep Code" }, - { 3, "Reserved" }, - { 0, NULL } + { 0, "Same Number Of Subchannels For The Selected Bands" }, + { 1, "Different Same Number Of Subchannels For The Selected Bands" }, + { 2, "Total Number Of Subchannels For The Selected Bands Determined by Nsch Code and Nep Code" }, + { 3, "Reserved" }, + { 0, NULL } }; /* Masks */ @@ -969,7 +969,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf #define MAX_LOGICAL_BANDS_SHIFT 21 #define NUM_BROADCAST_SYMBOLS_SHIFT 16 #define NUM_DL_AMC_SYMBOLS_SHIFT 10 -#define NUM_UL_AMC_SYMBOLS_SHIFT 4 +#define NUM_UL_AMC_SYMBOLS_SHIFT 4 #define CID_TYPE_SHIFT_1 (CID_TYPE_SHIFT-NUM_UL_AMC_SYMBOLS_SHIFT) #define SAFETY_PATTERN_SHIFT_1 (SAFETY_PATTERN_SHIFT-NUM_UL_AMC_SYMBOLS_SHIFT) #define BAND_AMC_SUBCHANNEL_TYPE_SHIFT_1 (BAND_AMC_SUBCHANNEL_TYPE_SHIFT-NUM_UL_AMC_SYMBOLS_SHIFT) @@ -2112,3 +2112,16 @@ void proto_register_wimax_compact_dlmap_ie(void) proto_register_field_array(proto_wimax_compact_dlmap_ie_decoder, hf_extension_type, array_length(hf_extension_type)); proto_register_field_array(proto_wimax_compact_dlmap_ie_decoder, hf_extended_diuc, array_length(hf_extended_diuc)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c index 22c987a65b..bef32f457a 100644 --- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c @@ -74,52 +74,52 @@ static gint ett_wimax_extension_type_ie_decoder = -1; /* Prefixes */ static const true_false_string tfs_prefix = { - "Enable HARQ", - "Temporary Disable HARQ" + "Enable HARQ", + "Temporary Disable HARQ" }; /* Region Changes */ static const true_false_string tfs_region_change = { - "Region Changed", - "No Region Change" + "Region Changed", + "No Region Change" }; /* Region Changes */ static const true_false_string tfs_yes_no_ie = { - "Yes", - "No" + "Yes", + "No" }; /* Repetition Coding Indications */ static const value_string vals_repetitions[] = { - { 0, "No Repetition Coding" }, - { 1, "Repetition Coding of 2 Used" }, - { 2, "Repetition Coding of 4 Used" }, - { 3, "Repetition Coding of 6 Used" }, - { 0, NULL } + { 0, "No Repetition Coding" }, + { 1, "Repetition Coding of 2 Used" }, + { 2, "Repetition Coding of 4 Used" }, + { 3, "Repetition Coding of 6 Used" }, + { 0, NULL } }; /* Allocation Modes */ static const value_string vals_allocation_modes[] = { - { 0, "Same Number Of Subchannels For The Selected Bands" }, - { 1, "Different Same Number Of Subchannels For The Selected Bands" }, - { 2, "Total Number Of Subchannels For The Selected Bands Determined by Nsch Code and Nep Code" }, - { 3, "Reserved" }, - { 0, NULL } + { 0, "Same Number Of Subchannels For The Selected Bands" }, + { 1, "Different Same Number Of Subchannels For The Selected Bands" }, + { 2, "Total Number Of Subchannels For The Selected Bands Determined by Nsch Code and Nep Code" }, + { 3, "Reserved" }, + { 0, NULL } }; /* CTypes */ static const value_string vals_ctypes[] = { - { 0, "2 Mini-subchannels (defines M=2)" }, - { 1, "2 Mini-subchannels (defines M=2)" }, - { 2, "3 Mini-subchannels (defines M=3)" }, - { 3, "6 Mini-subchannels (defines M=6)" }, - { 0, NULL } + { 0, "2 Mini-subchannels (defines M=2)" }, + { 1, "2 Mini-subchannels (defines M=2)" }, + { 2, "3 Mini-subchannels (defines M=3)" }, + { 3, "6 Mini-subchannels (defines M=6)" }, + { 0, NULL } }; /* Masks */ @@ -2125,3 +2125,16 @@ void proto_register_wimax_compact_ulmap_ie(void) proto_register_field_array(proto_wimax_compact_ulmap_ie_decoder, hf_cdma_allocation, array_length(hf_cdma_allocation)); proto_register_field_array(proto_wimax_compact_ulmap_ie_decoder, hf_extended_uiuc, array_length(hf_extended_uiuc)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/wimax/wimax_fch_decoder.c index 5cc8fd5d1c..0617272964 100644 --- a/plugins/wimax/wimax_fch_decoder.c +++ b/plugins/wimax/wimax_fch_decoder.c @@ -243,3 +243,16 @@ void proto_register_wimax_fch(void) register_dissector("wimax_fch_burst_handler", dissect_wimax_fch_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/wimax/wimax_ffb_decoder.c index 8b50926c47..da5c328d04 100644 --- a/plugins/wimax/wimax_ffb_decoder.c +++ b/plugins/wimax/wimax_ffb_decoder.c @@ -127,3 +127,16 @@ void proto_register_wimax_ffb(void) register_dissector("wimax_ffb_burst_handler", dissect_wimax_ffb_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/wimax/wimax_hack_decoder.c index f9ff3d2f63..11723ebcee 100644 --- a/plugins/wimax/wimax_hack_decoder.c +++ b/plugins/wimax/wimax_hack_decoder.c @@ -40,16 +40,16 @@ static gint ett_wimax_hack_decoder = -1; static const value_string vals_flags[] = { - {0, "Even Half-Slot (tiles 0,2,4)"}, - {1, "Odd Half-Slot (tiles 1,3,5)"}, - {0, NULL} + {0, "Even Half-Slot (tiles 0,2,4)"}, + {1, "Odd Half-Slot (tiles 1,3,5)"}, + {0, NULL} }; static const value_string vals_values[] = { - {0, "ACK"}, - {1, "NACK"}, - {0, NULL} + {0, "ACK"}, + {1, "NACK"}, + {0, NULL} }; /* static gint hf_hack_burst = -1; */ @@ -139,3 +139,16 @@ void proto_register_wimax_hack(void) proto_register_subtree_array(ett, array_length(ett)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c index 8c0dd4b8b3..e28b243fee 100644 --- a/plugins/wimax/wimax_harq_map_decoder.c +++ b/plugins/wimax/wimax_harq_map_decoder.c @@ -210,3 +210,16 @@ void proto_register_wimax_harq_map(void) register_dissector("wimax_harq_map_handler", dissector_wimax_harq_map_decoder, -1); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/wimax/wimax_phy_attributes_decoder.c index 9e5946de3a..7c0f7afe03 100644 --- a/plugins/wimax/wimax_phy_attributes_decoder.c +++ b/plugins/wimax/wimax_phy_attributes_decoder.c @@ -40,8 +40,8 @@ static gint ett_wimax_phy_attributes_decoder = -1; static const value_string vals_subchannel_types[] = { - {0, "DL PUSC"}, - {1, "DL FUSC"}, + { 0, "DL PUSC"}, + { 1, "DL FUSC"}, {16, "UL PUSC"}, {0, NULL} }; @@ -176,3 +176,16 @@ void proto_register_wimax_phy_attributes(void) proto_register_field_array(proto_wimax_phy_attributes_decoder, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_tlv.c b/plugins/wimax/wimax_tlv.c index 6041d34052..8c66b868bc 100644 --- a/plugins/wimax/wimax_tlv.c +++ b/plugins/wimax/wimax_tlv.c @@ -182,3 +182,16 @@ gint get_tlv_length_type(tlv_info_t *info) return (gint)info->length_type; return -1; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c index 51f0ab15d5..20e0a36870 100644 --- a/plugins/wimax/wimax_utils.c +++ b/plugins/wimax/wimax_utils.c @@ -187,16 +187,16 @@ static const value_string vals_harq[] = static const value_string vals_cs_specification[] = { - {0, "Reserved"}, - {1, "Packet, IPv4"}, - {2, "Packet, IPv6"}, - {3, "Packet, IEEE 802.3/Ethernet"}, - {4, "Packet, IEEE 802.1Q VLAN"}, - {5, "Packet, IPv4 over IEEE 802.3/Ethernet"}, - {6, "Packet, IPv6 over IEEE 802.3/Ethernet"}, - {7, "Packet, IPv4 over IEEE 802.1Q VLAN"}, - {8, "Packet, IPv6 over IEEE 802.1Q VLAN"}, - {9, "ATM"}, + { 0, "Reserved"}, + { 1, "Packet, IPv4"}, + { 2, "Packet, IPv6"}, + { 3, "Packet, IEEE 802.3/Ethernet"}, + { 4, "Packet, IEEE 802.1Q VLAN"}, + { 5, "Packet, IPv4 over IEEE 802.3/Ethernet"}, + { 6, "Packet, IPv6 over IEEE 802.3/Ethernet"}, + { 7, "Packet, IPv4 over IEEE 802.1Q VLAN"}, + { 8, "Packet, IPv6 over IEEE 802.1Q VLAN"}, + { 9, "ATM"}, {10, "Packet, IEEE 802.3/Ethernet with ROCH header compression"}, {11, "Packet, IEEE 802.3/Ethernet with ECRTP header compression"}, {12, "Packet, IP2 with ROCH header compression"}, @@ -262,16 +262,16 @@ static const value_string vals_atm_switching_encodings[] = static const value_string vals_cc[] = { - {0, "OK/success"}, - {1, "Reject-other"}, - {2, "Reject-unrecognized-configuration-setting"}, - {3, "Reject-temporary / reject-resource"}, - {4, "Reject-permanent / reject-admin"}, - {5, "Reject-not-owner"}, - {6, "Reject-service-flow-not-found"}, - {7, "Reject-service-flow-exists"}, - {8, "Reject-required-parameter-not-present"}, - {9, "Reject-header-suppression"}, + { 0, "OK/success"}, + { 1, "Reject-other"}, + { 2, "Reject-unrecognized-configuration-setting"}, + { 3, "Reject-temporary / reject-resource"}, + { 4, "Reject-permanent / reject-admin"}, + { 5, "Reject-not-owner"}, + { 6, "Reject-service-flow-not-found"}, + { 7, "Reject-service-flow-exists"}, + { 8, "Reject-required-parameter-not-present"}, + { 9, "Reject-header-suppression"}, {10, "Reject-unknown-transaction-id"}, {11, "Reject-authentication-failure"}, {12, "Reject-add-aborted"}, @@ -292,8 +292,8 @@ static const value_string vals_classification_action_rule[] = static const true_false_string tfs_supported = { - "supported", - "not supported" + "supported", + "not supported" }; #if 0 @@ -392,13 +392,13 @@ static const value_string vals_tek_encryption_ids[] = static const value_string vals_dcd_mac_version[] = { - {1, "Conformance with IEEE Std 802.16-2001"}, - {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, - {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, - {4, "Conformance with IEEE Std 802.16-2004"}, - {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, - {6, "reserved"}, - {0, NULL} + {1, "Conformance with IEEE Std 802.16-2001"}, + {2, "Conformance with IEEE Std 802.16c-2002 and its predecessors"}, + {3, "Conformance with IEEE Std 802.16a-2003 and its predecessors"}, + {4, "Conformance with IEEE Std 802.16-2004"}, + {5, "Conformance with IEEE Std 802.16-2004 and IEEE Std 802.16e-2005"}, + {6, "reserved"}, + {0, NULL} }; /* fix fields */ @@ -2424,7 +2424,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; } /* end of switch */ offset += tlv_len; - } /* end of while loop */ + } /* end of while loop */ } /**************************************************************/ @@ -3381,3 +3381,16 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto } /* end of while loop */ return offset; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ |