forked from osmocom/wireshark
Remove trailing blanks; Fix some indentation;
Add editor modelines. svn path=/trunk/; revision=52653
This commit is contained in:
Bill Meier
parent
94ba4e9875
commit
80b5c92af0
|
|
@ -526,13 +526,13 @@ create_string_tree(proto_tree *tree, header_field_info* hfi, tvbuff_t *tvb, guin
|
|||
subtree = proto_item_add_subtree(ti, ett_string);
|
||||
|
||||
/* length */
|
||||
add_varint_item(subtree, tvb, *offset, varint_length, &hfi_string_varint_count8,
|
||||
&hfi_string_varint_count16, &hfi_string_varint_count32,
|
||||
add_varint_item(subtree, tvb, *offset, varint_length, &hfi_string_varint_count8,
|
||||
&hfi_string_varint_count16, &hfi_string_varint_count32,
|
||||
&hfi_string_varint_count64);
|
||||
*offset += varint_length;
|
||||
|
||||
/* string */
|
||||
proto_tree_add_item(subtree, &hfi_string_value, tvb, *offset, string_length,
|
||||
proto_tree_add_item(subtree, &hfi_string_value, tvb, *offset, string_length,
|
||||
ENC_ASCII|ENC_NA);
|
||||
*offset += string_length;
|
||||
|
||||
|
|
|
|||
|
|
@ -1601,7 +1601,7 @@ static void show_drx_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
|
|||
ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_retransmission_timer, tvb,
|
||||
0, 0, frame_state->config.retransmissionTimer);
|
||||
PROTO_ITEM_SET_GENERATED(ti);
|
||||
|
||||
|
||||
if (frame_state->config.shortCycleConfigured) {
|
||||
ti = proto_tree_add_uint(drx_config_tree, hf_mac_lte_drx_config_short_cycle, tvb,
|
||||
0, 0, frame_state->config.shortCycle);
|
||||
|
|
@ -2710,7 +2710,7 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, volatil
|
|||
|
||||
/* Look up entry for this UE/RNTI */
|
||||
ULHarqBuffers *ueData = (ULHarqBuffers *)g_hash_table_lookup(
|
||||
mac_lte_ul_harq_hash, GUINT_TO_POINTER((guint)p_mac_lte_info->rnti));
|
||||
mac_lte_ul_harq_hash, GUINT_TO_POINTER((guint)p_mac_lte_info->rnti));
|
||||
if (ueData != NULL) {
|
||||
if (p_mac_lte_info->reTxCount >= 1) {
|
||||
/* Looking for frame previously on this harq-id */
|
||||
|
|
@ -3267,7 +3267,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
|
|||
|
||||
/* Update DRX state of UE */
|
||||
if (global_mac_lte_show_drx) {
|
||||
if ((p_mac_lte_info->reTxCount == 0) && !pinfo->fd->flags.visited) {
|
||||
if ((p_mac_lte_info->reTxCount == 0) && !pinfo->fd->flags.visited) {
|
||||
|
||||
/* Update UE state to this subframe (but before this event is processed) */
|
||||
update_drx_info(pinfo, p_mac_lte_info);
|
||||
|
|
@ -5436,7 +5436,7 @@ void set_mac_lte_drx_config(guint16 ueid, drx_config_t *drx_config, packet_info
|
|||
/* ue_state->currentTime = pinfo->fd->abs_ts;*/
|
||||
}
|
||||
else {
|
||||
previousFrameNum = ue_state->config.frameNum;
|
||||
previousFrameNum = ue_state->config.frameNum;
|
||||
}
|
||||
|
||||
/* Clearing state when new config comes in... */
|
||||
|
|
@ -6753,3 +6753,15 @@ void proto_reg_handoff_mac_lte(void)
|
|||
rlc_lte_handle = find_dissector("rlc-lte");
|
||||
}
|
||||
|
||||
/*
|
||||
* 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:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ static gint ett_miop = -1;
|
|||
static expert_field ei_miop_version_not_supported = EI_INIT;
|
||||
static expert_field ei_miop_unique_id_len_exceed_max_value = EI_INIT;
|
||||
|
||||
#define MIOP_MAGIC 0x4d494f50 /* "MIOP" */
|
||||
#define MIOP_MAGIC 0x4d494f50 /* "MIOP" */
|
||||
|
||||
static void dissect_miop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree);
|
||||
|
||||
|
|
@ -318,3 +318,16 @@ void proto_reg_handoff_miop (void) {
|
|||
heur_dissector_add("udp", dissect_miop_heur, proto_miop);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 2
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=2 tabstop=8 expandtab:
|
||||
* :indentSize=2:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -474,25 +474,28 @@ dissect_openflow_phy_port(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
|
|||
|
||||
|
||||
}
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Switch features.
|
||||
*
|
||||
*/
|
||||
|
||||
struct ofp_switch_features {
|
||||
struct ofp_header header;
|
||||
uint64_t datapath_id; * Datapath unique ID. The lower 48-bits are for
|
||||
a MAC address, while the upper 16-bits are
|
||||
implementer-defined. *
|
||||
uint32_t n_buffers; * Max packets buffered at once. *
|
||||
uint8_t n_tables; * Number of tables supported by datapath. *
|
||||
uint8_t pad[3]; * Align to 64-bits. *
|
||||
* Features. *
|
||||
uint32_t capabilities; * Bitmap of support "ofp_capabilities". *
|
||||
uint32_t actions; * Bitmap of supported "ofp_action_type"s. *
|
||||
* Port info.*
|
||||
struct ofp_phy_port ports[0]; / Port definitions. The number of ports
|
||||
is inferred from the length field in
|
||||
the header.
|
||||
*/
|
||||
struct ofp_header header;
|
||||
uint64_t datapath_id; /* Datapath unique ID. The lower 48-bits are for
|
||||
a MAC address, while the upper 16-bits are
|
||||
implementer-defined. */
|
||||
uint32_t n_buffers; /* Max packets buffered at once. */
|
||||
uint8_t n_tables; /* Number of tables supported by datapath. */
|
||||
uint8_t pad[3]; /* Align to 64-bits. */
|
||||
/* Features. */
|
||||
uint32_t capabilities; /* Bitmap of support "ofp_capabilities". */
|
||||
uint32_t actions; /* Bitmap of supported "ofp_action_type"s. */
|
||||
/* Port info.*/
|
||||
struct ofp_phy_port ports[0]; /* Port definitions. The number of ports
|
||||
is inferred from the length field in
|
||||
the header. */
|
||||
#endif
|
||||
|
||||
static void
|
||||
dissect_openflow_features_reply_v1_0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint16 length)
|
||||
|
|
@ -893,7 +896,7 @@ dissect_openflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
|
|||
offset = dissect_openflow_v_1_0(tvb, pinfo, tree, data);
|
||||
break;
|
||||
case OFP_VERSION_1_3:
|
||||
call_dissector(openflow_v4_handle, tvb, pinfo, tree);
|
||||
call_dissector(openflow_v4_handle, tvb, pinfo, tree);
|
||||
offset = tvb_length(tvb);
|
||||
break;
|
||||
default:
|
||||
|
|
@ -905,7 +908,7 @@ dissect_openflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
|
|||
return offset;
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
* Register the protocol with Wireshark.
|
||||
*/
|
||||
void
|
||||
|
|
@ -1386,7 +1389,7 @@ proto_register_openflow(void)
|
|||
proto_openflow = proto_register_protocol("OpenFlow",
|
||||
"openflow", "openflow");
|
||||
|
||||
new_register_dissector("openflow", dissect_openflow, proto_openflow);
|
||||
new_register_dissector("openflow", dissect_openflow, proto_openflow);
|
||||
|
||||
/* Required function calls to register the header fields and subtrees */
|
||||
proto_register_field_array(proto_openflow, hf, array_length(hf));
|
||||
|
|
@ -1419,7 +1422,7 @@ proto_reg_handoff_openflow(void)
|
|||
|
||||
dissector_add_uint("tcp.port", currentPort, openflow_handle);
|
||||
eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
|
||||
openflow_v4_handle = find_dissector("openflow_v4");
|
||||
openflow_v4_handle = find_dissector("openflow_v4");
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue