SunnyQjm/openflow
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix flow mod display in dissector

Browse Source
This commit is contained in:
Brandon Heller committed 2008-12-01 01:34:01 -08:00
1 parent 2eab287131
commit d1847933ca
1 file changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files
utilities/wireshark_dissectors/openflow/packet-openflow.c
+10 -10
View File
@@ -1527,7 +1527,7 @@ static void dissect_phy_ports(proto_tree* tree, proto_item* item, tvbuff_t *tvb,
static void dissect_wildcards(proto_tree* match_tree, proto_item* match_item, tvbuff_t *tvb, packet_info *pinfo, guint32 *offset)
{
proto_item *wild_item = proto_tree_add_item(match_tree, ofp_match_wildcards_hdr, tvb, *offset, 2, FALSE);
proto_item *wild_item = proto_tree_add_item(match_tree, ofp_match_wildcards_hdr, tvb, *offset, 4, FALSE);
proto_tree *wild_tree = proto_item_add_subtree(wild_item, ett_ofp_match_wildcards_hdr);
/* add wildcard subtree */
@@ -1535,7 +1535,7 @@ static void dissect_wildcards(proto_tree* match_tree, proto_item* match_item, tv
int i;
for(i=0; i<NUM_WILDCARDS; i++)
add_child_const(wild_tree, ofp_match_wildcards[i], tvb, *offset, 2 );
add_child_const(wild_tree, ofp_match_wildcards[i], tvb, *offset, 4 );
*offset += 4;
/* display mask bits if nonzero */
@@ -1557,29 +1557,29 @@ static void dissect_match(proto_tree* tree, proto_item* item, tvbuff_t *tvb, pac
/* save wildcards field for later */
guint32 wildcards = tvb_get_ntohl( tvb, *offset );
dissect_wildcards(match_tree, match_item, tvb, pinfo, &offset);
dissect_wildcards(match_tree, match_item, tvb, pinfo, offset);
/* show only items whose corresponding wildcard bit is not set */
if( ~wildcards & OFPFW_IN_PORT )
dissect_port(match_tree, ofp_match_in_port, tvb, offset);
else
*offset += 2;
if( ~wildcards & OFPFW_DL_VLAN )
add_child(match_tree, ofp_match_dl_vlan, tvb, offset, 2);
else
*offset += 2;
if( ~wildcards & OFPFW_DL_SRC )
add_child(match_tree, ofp_match_dl_src, tvb, offset, 6);
else
*offset += 6;
if( ~wildcards & OFPFW_DL_DST )
add_child(match_tree, ofp_match_dl_dst, tvb, offset, 6);
else
*offset += 6;
if( ~wildcards & OFPFW_DL_VLAN )
add_child(match_tree, ofp_match_dl_vlan, tvb, offset, 2);
else
*offset += 2;
if( ~wildcards & OFPFW_DL_TYPE )
add_child(match_tree, ofp_match_dl_type, tvb, offset, 2);
else
@@ -1643,7 +1643,7 @@ static gint dissect_action(proto_tree* tree, proto_item* item, tvbuff_t *tvb, pa
proto_tree *action_tree = proto_item_add_subtree(action_item, ett_ofp_action);
if (!(len == 8 || len == 16)) {
add_child_str(action_tree, ofp_action_unknown, tvb, &offset, len, "Invalid Action Length");
add_child_str(action_tree, ofp_action_unknown, tvb, offset, len, "Invalid Action Length");
return -1;
}