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

remove the code that conditionally dissects LG only if IG is set 

svn path=/trunk/; revision=19034
This commit is contained in:
Ronnie Sahlberg 2006-08-25 21:53:37 +00:00
parent 19f3809cc6
commit 0899de4bd5
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
epan/dissectors/packet-eth.c
View File

@ -294,10 +294,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
}
proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 0, 6, dst_addr);
proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, FALSE);
/* only dissect the lg bit for unicast addresses */
if(!(tvb_get_guint8(tvb, 0)&&0x01)){
proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, FALSE);
}
proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, FALSE);
addr_item=proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr);
if(addr_item){
@ -305,10 +302,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
}
proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 6, 6, src_addr);
proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, FALSE);
/* only dissect the lg bit for unicast addresses */
if(!(tvb_get_guint8(tvb, 6)&&0x01)){
proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, FALSE);
}
proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, FALSE);
dissect_802_3(ehdr->type, is_802_2, tvb, ETH_HEADER_SIZE, pinfo, parent_tree, fh_tree,
hf_eth_len, hf_eth_trailer, fcs_len);
@ -337,10 +331,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
}
proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 0, 6, dst_addr);
proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, FALSE);
/* only dissect the lg bit for unicast addresses */
if(!(tvb_get_guint8(tvb, 0)&&0x01)){
proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, FALSE);
}
proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, FALSE);
addr_item=proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr);
if(addr_item){
@ -348,10 +339,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
}
proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 6, 6, src_addr);
proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 6, 3, FALSE);
/* only dissect the lg bit for unicast addresses */
if(!(tvb_get_guint8(tvb, 6)&&0x01)){
proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, FALSE);
}
proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 6, 3, FALSE);
ethertype(ehdr->type, tvb, ETH_HEADER_SIZE, pinfo, parent_tree, fh_tree, hf_eth_type,
hf_eth_trailer, fcs_len);