osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt to fix build errors. 

svn path=/trunk/; revision=26892
This commit is contained in:
Stig Bjørlykke 2008-12-01 11:03:28 +00:00
parent 50de995bbc
commit 861a0ac58c
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
epan/dissectors/packet-sflow.c
View File

@ -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,28 +1073,28 @@ 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:
offset = dissect_sflow_extended_switch(tvb, extended_data_tree, offset); offset = dissect_sflow_extended_switch(tvb, extended_data_tree, offset);
break; break;
case SFLOW_EXTENDED_ROUTER: case SFLOW_EXTENDED_ROUTER:
offset = dissect_sflow_extended_router(tvb, extended_data_tree, offset); offset = dissect_sflow_extended_router(tvb, extended_data_tree, offset);
break; break;
case SFLOW_EXTENDED_GATEWAY: case SFLOW_EXTENDED_GATEWAY:
offset = dissect_sflow_extended_gateway(tvb, extended_data_tree, offset); offset = dissect_sflow_extended_gateway(tvb, extended_data_tree, offset);
break; break;
case SFLOW_EXTENDED_URL: case SFLOW_EXTENDED_URL:
offset = dissect_sflow_extended_url(tvb, extended_data_tree, offset); offset = dissect_sflow_extended_url(tvb, extended_data_tree, offset);
break; break;
case SFLOW_EXTENDED_USER: case SFLOW_EXTENDED_USER:
offset = dissect_sflow_extended_user(tvb, extended_data_tree, offset); offset = dissect_sflow_extended_user(tvb, extended_data_tree, offset);
break; break;
default: default:
break; break;
}
proto_item_set_end(ti, tvb, offset);
} }
proto_item_set_end(ti, tvb, offset);
} }
} }
if (version == 5) if (version == 5)
@ -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);