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

Fix inconsistent indentation. 

Change-Id: If757fb60023f2bf733ed3f51b6d6a18756283b42
Reviewed-on: https://code.wireshark.org/review/8285
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-05-03 15:15:30 -07:00
parent 85d3b61edb
commit 58ec8df614
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
epan/dissectors/packet-atm.c
View File

@ -999,55 +999,55 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
{
if (tvb_reported_length(next_tvb) > 7) /* sizeof(octet) */
{
guint8 octet[8];
tvb_memcpy(next_tvb, octet, 0, sizeof(octet));
guint8 octet[8];
tvb_memcpy(next_tvb, octet, 0, sizeof(octet));
if (octet[0] == 0xaa
&& octet[1] == 0xaa
&& octet[2] == 0x03) /* LLC SNAP as per RFC2684 */
{
call_dissector(llc_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if ((pntoh16(octet) & 0xff) == PPP_IP)
{
call_dissector(ppp_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (pntoh16(octet) == 0x00)
{
/* assume vc muxed bridged ethernet */
proto_tree_add_item(tree, hf_atm_padding, tvb, 0, 2, ENC_NA);
next_tvb = tvb_new_subset_remaining(tvb, 2);
call_dissector(eth_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (octet[2] == 0x03 && /* NLPID */
((octet[3] == 0xcc || /* IPv4 */
octet[3] == 0x8e) || /* IPv6 */
(octet[3] == 0x00 && /* Eth */
octet[4] == 0x80))) /* Eth */
{
/* assume network interworking with FR 2 byte header */
call_dissector(fr_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (octet[4] == 0x03 && /* NLPID */
((octet[5] == 0xcc || /* IPv4 */
octet[5] == 0x8e) || /* IPv6 */
(octet[5] == 0x00 && /* Eth */
octet[6] == 0x80))) /* Eth */
{
/* assume network interworking with FR 4 byte header */
call_dissector(fr_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (((octet[0] & 0xf0)== 0x40) ||
((octet[0] & 0xf0) == 0x60))
{
call_dissector(ip_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
if (octet[0] == 0xaa
&& octet[1] == 0xaa
&& octet[2] == 0x03) /* LLC SNAP as per RFC2684 */
{
call_dissector(llc_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if ((pntoh16(octet) & 0xff) == PPP_IP)
{
call_dissector(ppp_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (pntoh16(octet) == 0x00)
{
/* assume vc muxed bridged ethernet */
proto_tree_add_item(tree, hf_atm_padding, tvb, 0, 2, ENC_NA);
next_tvb = tvb_new_subset_remaining(tvb, 2);
call_dissector(eth_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (octet[2] == 0x03 && /* NLPID */
((octet[3] == 0xcc || /* IPv4 */
octet[3] == 0x8e) || /* IPv6 */
(octet[3] == 0x00 && /* Eth */
octet[4] == 0x80))) /* Eth */
{
/* assume network interworking with FR 2 byte header */
call_dissector(fr_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (octet[4] == 0x03 && /* NLPID */
((octet[5] == 0xcc || /* IPv4 */
octet[5] == 0x8e) || /* IPv6 */
(octet[5] == 0x00 && /* Eth */
octet[6] == 0x80))) /* Eth */
{
/* assume network interworking with FR 4 byte header */
call_dissector(fr_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (((octet[0] & 0xf0)== 0x40) ||
((octet[0] & 0xf0) == 0x60))
{
call_dissector(ip_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
}
}
break;