diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-09-30 19:12:26 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-09-30 23:17:01 +0000 |
| commit | 01b093c24d53c8304b4e36741a0df00125105795 (patch) | |
| tree | 172df29bcfb12a6af1c8b5a04516a6374f8c9d97 /epan/dissectors/packet-ap1394.c | |
| parent | 0cc027cc267952e51e7b17e8e3cef51592f9e013 (diff) | |
Add editor modelines; Adjust whitespace as needed.
Change-Id: I434da226c842298f4fb2a4335d06d51e164af2af
Reviewed-on: https://code.wireshark.org/review/4394
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-ap1394.c')
| -rw-r--r-- | epan/dissectors/packet-ap1394.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index 96088c7f09..cc6e81e390 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -76,16 +76,16 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); src_addr=tvb_get_ptr(tvb, 8, 8); - SET_ADDRESS(&pinfo->dl_src, AT_EUI64, 8, src_addr); - SET_ADDRESS(&pinfo->src, AT_EUI64, 8, src_addr); + SET_ADDRESS(&pinfo->dl_src, AT_EUI64, 8, src_addr); + SET_ADDRESS(&pinfo->src, AT_EUI64, 8, src_addr); dst_addr=tvb_get_ptr(tvb, 0, 8); - SET_ADDRESS(&pinfo->dl_dst, AT_EUI64, 8, dst_addr); - SET_ADDRESS(&pinfo->dst, AT_EUI64, 8, dst_addr); + SET_ADDRESS(&pinfo->dl_dst, AT_EUI64, 8, dst_addr); + SET_ADDRESS(&pinfo->dst, AT_EUI64, 8, dst_addr); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_ap1394, tvb, 0, 18, - "Apple IP-over-IEEE 1394, Src: %s, Dst: %s", - bytes_to_ep_str(src_addr, 8), bytes_to_ep_str(dst_addr, 8)); + "Apple IP-over-IEEE 1394, Src: %s, Dst: %s", + bytes_to_ep_str(src_addr, 8), bytes_to_ep_str(dst_addr, 8)); fh_tree = proto_item_add_subtree(ti, ett_ap1394); proto_tree_add_bytes(fh_tree, hf_ap1394_dst, tvb, 0, 8, dst_addr); proto_tree_add_bytes(fh_tree, hf_ap1394_src, tvb, 8, 8, src_addr); @@ -95,7 +95,7 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(fh_tree, hf_ap1394_type, tvb, 16, 2, etype); next_tvb = tvb_new_subset_remaining(tvb, 18); if (!dissector_try_uint(ethertype_subdissector_table, etype, next_tvb, - pinfo, tree)) + pinfo, tree)) call_dissector(data_handle, next_tvb, pinfo, tree); } @@ -111,7 +111,7 @@ proto_register_ap1394(void) NULL, 0x0, "Source address", HFILL }}, /* registered here but handled in ethertype.c */ { &hf_ap1394_type, - { "Type", "ap1394.type", FT_UINT16, BASE_HEX, + { "Type", "ap1394.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, NULL, HFILL }}, }; static gint *ett[] = { @@ -135,3 +135,16 @@ proto_reg_handoff_ap1394(void) ap1394_handle = create_dissector_handle(dissect_ap1394, proto_ap1394); dissector_add_uint("wtap_encap", WTAP_ENCAP_APPLE_IP_OVER_IEEE1394, ap1394_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ |