osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Wimax Plugins: Fix indent (use tabs) and modelines 

Change-Id: I27a976c9cac598be5a90412da171915181a784d3
Reviewed-on: https://code.wireshark.org/review/3656
Reviewed-by: Evan Huus <eapache@gmail.com>
This commit is contained in:
Alexis La Goutte 2014-08-15 19:48:22 +02:00 committed by Evan Huus
parent c8cb153ec8
commit 305f36d711
10 changed files with 1902 additions and 1785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/wimax/mac_hd_generic_decoder.c
View File

@ -2271,5 +2271,18 @@ void
proto_reg_handoff_mac_header_generic(void)
{
mac_mgmt_msg_decoder_handle = find_dissector("wmx_mac_mgmt_msg_decoder");
mac_ip_handle = find_dissector("ip");
mac_ip_handle = find_dissector("ip");
}
/*
* 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:
*/

53
plugins/wimax/msg_aas_fbck.c
View File

@ -32,15 +32,15 @@
#include <epan/packet.h>
#include "wimax_mac.h"
#define OFDMA_AAS_FBCK_REQ_NUMBER_OF_FRAME_MASK 0xFE
#define OFDMA_AAS_FBCK_REQ_DATA_TYPE_MASK 0x01
#define OFDMA_AAS_FBCK_REQ_FB_REQ_COUNTER_MASK 0xE0
#define OFDMA_AAS_FBCK_REQ_NUMBER_OF_FRAME_MASK 0xFE
#define OFDMA_AAS_FBCK_REQ_DATA_TYPE_MASK 0x01
#define OFDMA_AAS_FBCK_REQ_FB_REQ_COUNTER_MASK 0xE0
#define OFDMA_AAS_FBCK_REQ_FB_REQ_RESOLUTION_MASK 0x18
#define OFDMA_AAS_FBCK_REQ_FB_REQ_RESERVED_MASK 0x07
#define OFDMA_AAS_FBCK_REQ_FB_REQ_RESERVED_MASK 0x07
#define OFDMA_AAS_FBCK_REQ_FB_RSP_RESERVED_MASK 0xC0
#define OFDMA_AAS_FBCK_RSP_DATA_TYPE_MASK 0x20
#define OFDMA_AAS_FBCK_REQ_FB_RSP_COUNTER_MASK 0x1C
#define OFDMA_AAS_FBCK_REQ_FB_RSP_RESERVED_MASK 0xC0
#define OFDMA_AAS_FBCK_RSP_DATA_TYPE_MASK 0x20
#define OFDMA_AAS_FBCK_REQ_FB_RSP_COUNTER_MASK 0x1C
#define OFDMA_AAS_FBCK_REQ_FB_RSP_RESOLUTION_MASK 0x03
void proto_register_mac_mgmt_msg_aas_fbck(void);
@ -52,27 +52,27 @@ static gint ett_mac_mgmt_msg_aas_fbck_rsp_decoder = -1;
static const value_string vals_data_types[] =
{
{0, "measure on downlink preamble only"},
{1, "measure on downlink data (for this SS) only"},
{0, NULL}
{0, "measure on downlink preamble only"},
{1, "measure on downlink data (for this SS) only"},
{0, NULL}
};
static const value_string vals_resolutions_0[] =
{
{0, "32 subcarriers"},
{1, "64 subcarriers"},
{2, "128 subcarriers"},
{3, "256 subcarriers"},
{0, NULL}
{0, "32 subcarriers"},
{1, "64 subcarriers"},
{2, "128 subcarriers"},
{3, "256 subcarriers"},
{0, NULL}
};
static const value_string vals_resolutions_1[] =
{
{0, "1 subcarrier"},
{1, "4 subcarriers"},
{2, "8 subcarriers"},
{3, "16 subcarriers"},
{0, NULL}
{0, "1 subcarrier"},
{1, "4 subcarriers"},
{2, "8 subcarriers"},
{3, "16 subcarriers"},
{0, NULL}
};
/* fix fields */
@ -345,3 +345,16 @@ proto_reg_handoff_mac_mgmt_msg_aas(void)
aas_handle = create_dissector_handle(dissect_mac_mgmt_msg_aas_fbck_rsp_decoder, proto_mac_mgmt_msg_aas_fbck_decoder);
dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_AAS_FBCK_RSP, 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:
*/

3436
plugins/wimax/msg_dlmap.c
View File

File diff suppressed because it is too large Load Diff

15
plugins/wimax/msg_dsc.c
View File

@ -165,7 +165,7 @@ void proto_register_mac_mgmt_msg_dsc(void)
proto_register_field_array(proto_mac_mgmt_msg_dsc_decoder, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
register_dissector("mac_mgmt_msg_dsc_rsp_handler", dissect_mac_mgmt_msg_dsc_rsp_decoder, -1);
register_dissector("mac_mgmt_msg_dsc_rsp_handler", dissect_mac_mgmt_msg_dsc_rsp_decoder, -1);
}
void
@ -182,3 +182,16 @@ proto_reg_handoff_mac_mgmt_msg_dsc(void)
dsc_handle = create_dissector_handle(dissect_mac_mgmt_msg_dsc_ack_decoder, proto_mac_mgmt_msg_dsc_decoder);
dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_DSC_ACK, dsc_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:
*/

13
plugins/wimax/msg_pmc.c
View File

@ -246,3 +246,16 @@ proto_reg_handoff_mac_mgmt_msg_pmc(void)
pmc_handle = create_dissector_handle(dissect_mac_mgmt_msg_pmc_rsp_decoder, proto_mac_mgmt_msg_pmc_rsp_decoder);
dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_PMC_RSP, pmc_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:
*/

63
plugins/wimax/msg_reg_req.c
View File

@ -161,62 +161,62 @@ static gint hf_reg_req_bs_switching_timer = -1;
/* STRING RESOURCES */
static const true_false_string tfs_reg_ip_mgmt_mode = {
"IP-managed mode",
"Unmanaged mode"
"IP-managed mode",
"Unmanaged mode"
};
static const true_false_string tfs_reg_ss_mgmt_support = {
"secondary management connection",
"no secondary management connection"
"secondary management connection",
"no secondary management connection"
};
#if 0
static const true_false_string tfs_arq_enable = {
"ARQ Requested/Accepted",
"ARQ Not Requested/Accepted"
"ARQ Requested/Accepted",
"ARQ Not Requested/Accepted"
};
#endif
#if 0
static const true_false_string tfs_arq_deliver_in_order = {
"Order of delivery is preserved",
"Order of delivery is not preserved"
"Order of delivery is preserved",
"Order of delivery is not preserved"
};
#endif
static const true_false_string tfs_reg_fbss_mdho_ho_disable = {
"Disable",
"Enable"
"Disable",
"Enable"
};
static const value_string vals_reg_ip_version[] = {
{0x1, "IPv4"},
{0x2, "IPV6"},
{0, NULL}
{0x1, "IPv4"},
{0x2, "IPV6"},
{0, NULL}
};
static const value_string vals_reg_phs_support[] = {
{0, "no PHS support"},
{1, "ATM PHS"},
{2, "Packet PHS"},
{3, "ATM and Packet PHS"},
{0, NULL}
{0, "no PHS support"},
{1, "ATM PHS"},
{2, "Packet PHS"},
{3, "ATM and Packet PHS"},
{0, NULL}
};
static const true_false_string tfs_supported = {
"supported",
"unsupported"
"supported",
"unsupported"
};
static const true_false_string tfs_mac_crc_support = {
"MAC CRC Support (Default)",
"No MAC CRC Support"
"MAC CRC Support (Default)",
"No MAC CRC Support"
};
static const value_string tfs_support[] = {
{0, "not supported"},
{1, "supported"},
{0, NULL}
{0, "not supported"},
{1, "supported"},
{0, NULL}
};
/* Decode REG-REQ sub-TLV's. */
@ -1439,3 +1439,16 @@ void proto_reg_handoff_mac_mgmt_msg_reg_req(void)
reg_req_handle = create_dissector_handle(dissect_mac_mgmt_msg_reg_req_decoder, proto_mac_mgmt_msg_reg_req_decoder);
dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_REG_REQ, reg_req_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:
*/

33
plugins/wimax/msg_rng_req.c
View File

@ -86,8 +86,8 @@ static gint hf_rng_req_requested_rep_coding_level = -1;
/* STRING RESOURCES */
static const true_false_string tfs_rng_req_aas_broadcast = {
"SS cannot receive broadcast messages",
"SS can receive broadcast messages"
"SS cannot receive broadcast messages",
"SS can receive broadcast messages"
};
static const value_string vals_rng_req_ranging_purpose_location_update_request[] = {
@ -104,23 +104,23 @@ static const value_string vals_rng_req_repetition_coding_level[] = {
};
static const true_false_string tfs_rng_activate = {
"Activate",
"Deactivate"
"Activate",
"Deactivate"
};
static const true_false_string tfs_rng_max_power = {
"SS is already at maximum power",
"SS is not at maximum power"
"SS is already at maximum power",
"SS is not at maximum power"
};
static const true_false_string tfs_rng_min_power = {
"SS is already at minimum power",
"SS is not at minimum power"
"SS is already at minimum power",
"SS is not at minimum power"
};
static const true_false_string tfs_rng_timing_adj = {
"Sum of commanded timing adjustments is too large",
"Sum of commanded timing adjustments is within bounds"
"Sum of commanded timing adjustments is too large",
"Sum of commanded timing adjustments is within bounds"
};
/* Decode RNG Power Saving Class parameters (Sub TLV's). */
@ -629,3 +629,16 @@ void proto_reg_handoff_mac_mgmt_msg_rng_req(void)
dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_RNG_REQ, rng_req_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:
*/

23
plugins/wimax/msg_ulmap.c
View File

@ -1209,7 +1209,7 @@ static gint UL_sounding_command_IE(proto_tree *uiuc_tree, gint offset, gint leng
XBIT(nssym, 3, "Num_Sounding_Symbols");
XBIT(data, 1, "Reserved");
for (i = 0; i < nssym; i++) {
XBIT(sept, 1, "Separability Type");
XBIT(sept, 1, "Separability Type");
if (sept == 0) {
XBIT(data, 3, "Max Cyclic Shift Index P");
XBIT(data, 1, "Reserved");
@ -2323,10 +2323,10 @@ void proto_register_mac_mgmt_msg_ulmap(void)
};
proto_mac_mgmt_msg_ulmap_decoder = proto_register_protocol (
"WiMax ULMAP Messages", /* name */
"WiMax ULMAP", /* short name */
"wmx.ulmap" /* abbrev */
);
"WiMax ULMAP Messages", /* name */
"WiMax ULMAP", /* short name */
"wmx.ulmap" /* abbrev */
);
proto_register_field_array(proto_mac_mgmt_msg_ulmap_decoder, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
@ -2339,3 +2339,16 @@ void proto_reg_handoff_mac_mgmt_msg_ulmap(void)
ulmap_handle = create_dissector_handle(dissect_mac_mgmt_msg_ulmap_decoder, proto_mac_mgmt_msg_ulmap_decoder);
dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_UL_MAP, ulmap_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:
*/

23
plugins/wimax/packet-wmx.c
View File

@ -39,10 +39,10 @@
void proto_register_wimax(void);
/* Global variables */
gint proto_wimax = -1;
gint8 arq_enabled = 0;
gint scheduling_service_type = 0;
gint mac_sdu_length = 49; /* default SDU size is 49 bytes (11.13.16) */
gint proto_wimax = -1;
gint8 arq_enabled = 0;
gint scheduling_service_type = 0;
gint mac_sdu_length = 49; /* default SDU size is 49 bytes (11.13.16) */
extern guint global_cid_max_basic;
extern gboolean include_cor2_changes;
@ -53,7 +53,7 @@ static int hf_tlv_type = -1;
static int hf_tlv_length = -1;
static int hf_tlv_length_size = -1;
#define MAX_NUM_TLVS 256
#define MAX_NUM_TLVS 256
/* Global TLV array to retrieve unique subtree identifiers */
static gint ett_tlv[MAX_NUM_TLVS];
@ -330,3 +330,16 @@ void proto_register_wimax(void)
prefs_register_obsolete_preference(wimax_module, "wimax.basic_cid_max");
prefs_register_obsolete_preference(wimax_module, "wimax.corrigendum_2_version");
}
/*
* 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:
*/

13
plugins/wimax/wimax_pdu_decoder.c
View File

@ -256,3 +256,16 @@ proto_reg_handoff_wimax_pdu(void)
mac_header_type2_handle = find_dissector("mac_header_type_2_handler");
wimax_harq_map_handle = find_dissector("wimax_harq_map_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:
*/