Attempt to fix build errors.
svn path=/trunk/; revision=26892
This commit is contained in:
parent
50de995bbc
commit
861a0ac58c
|
@ -1006,7 +1006,8 @@ dissect_sflow_flow_sample(tvbuff_t *tvb, packet_info *pinfo,
|
||||||
|
|
||||||
if (version == 5) {
|
if (version == 5) {
|
||||||
record_length = tvb_get_ntohl(tvb, offset);
|
record_length = tvb_get_ntohl(tvb, offset);
|
||||||
proto_tree_add_item(tree, hf_sflow_fs_recordlength, tvb, offset, 4, FALSE);
|
ti = proto_tree_add_item(tree, hf_sflow_fs_recordlength, tvb, offset, 4, FALSE);
|
||||||
|
extended_data_tree = proto_item_add_subtree(ti, ett_sflow_extended_data);
|
||||||
offset += 4;
|
offset += 4;
|
||||||
nextoffset = offset + record_length;
|
nextoffset = offset + record_length;
|
||||||
|
|
||||||
|
@ -1072,7 +1073,6 @@ dissect_sflow_flow_sample(tvbuff_t *tvb, packet_info *pinfo,
|
||||||
hf_sflow4_extended_information_type, tvb, offset, 4,
|
hf_sflow4_extended_information_type, tvb, offset, 4,
|
||||||
ext_type);
|
ext_type);
|
||||||
offset += 4;
|
offset += 4;
|
||||||
}
|
|
||||||
|
|
||||||
switch (ext_type) {
|
switch (ext_type) {
|
||||||
case SFLOW_EXTENDED_SWITCH:
|
case SFLOW_EXTENDED_SWITCH:
|
||||||
|
@ -1096,6 +1096,7 @@ dissect_sflow_flow_sample(tvbuff_t *tvb, packet_info *pinfo,
|
||||||
proto_item_set_end(ti, tvb, offset);
|
proto_item_set_end(ti, tvb, offset);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (version == 5)
|
if (version == 5)
|
||||||
return return_offset;
|
return return_offset;
|
||||||
else
|
else
|
||||||
|
@ -1148,6 +1149,7 @@ dissect_sflow_counters_sample(tvbuff_t *tvb, proto_tree *tree,
|
||||||
"%s record", val_to_str(counters_type, sflow_counterstype, "%u"));
|
"%s record", val_to_str(counters_type, sflow_counterstype, "%u"));
|
||||||
record_tree = proto_item_add_subtree(ti, ett_sflow_counters_record);
|
record_tree = proto_item_add_subtree(ti, ett_sflow_counters_record);
|
||||||
} else {
|
} else {
|
||||||
|
record_length = 0;
|
||||||
record_tree = tree;
|
record_tree = tree;
|
||||||
}
|
}
|
||||||
proto_tree_add_item(record_tree, hf_sflow_cs_record_type, tvb, offset, 4, FALSE);
|
proto_tree_add_item(record_tree, hf_sflow_cs_record_type, tvb, offset, 4, FALSE);
|
||||||
|
|
Loading…
Reference in New Issue