diff options
105 files changed, 1760 insertions, 410 deletions
diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index 0beaa34f2c..bb78c8fa21 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.c @@ -2421,3 +2421,16 @@ proto_reg_handoff_alcap(void) dissector_add_uint("mtp3.service_indicator", MTP_SI_AAL2, alcap_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 188622eedd..368c9b13c1 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -13616,3 +13616,16 @@ proto_reg_handoff_amqp(void) dissector_add_uint("tcp.port", amqp_port, amqp_tcp_handle); } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index c3d75727e7..d432c078ff 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -936,3 +936,15 @@ proto_reg_handoff_ancp(void) ancp_stats_tree_packet, ancp_stats_tree_init, NULL); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 0297a1ee9c..9c3f0bf58c 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -370,3 +370,16 @@ proto_reg_handoff_arcnet (void) dissector_add_uint ("wtap_encap", WTAP_ENCAP_ARCNET_LINUX, arcnet_linux_handle); data_handle = find_dissector ("data"); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index e76ae6a2dc..a9b677cb48 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -2023,3 +2023,16 @@ proto_reg_handoff_arp(void) dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_RARP_1201, arp_handle); dissector_add_uint("ax25.pid", AX25_P_ARP, arp_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: + */ diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 3e2de94def..3acffeb20e 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -2049,3 +2049,16 @@ proto_reg_handoff_atm(void) dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, atm_untruncated_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: + */ diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index 2fe644ee7c..f38ca200ff 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.c @@ -300,3 +300,16 @@ proto_reg_handoff_auto_rp(void) proto_auto_rp); dissector_add_uint("udp.port", UDP_PORT_PIM_RP_DISC, auto_rp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=8 tabstop=8 expandtab: + * :indentSize=8:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c index 586aef8955..a971a44292 100644 --- a/epan/dissectors/packet-babel.c +++ b/epan/dissectors/packet-babel.c @@ -513,3 +513,16 @@ proto_reg_handoff_babel(void) dissector_add_uint("udp.port", UDP_PORT_BABEL, babel_handle); dissector_add_uint("udp.port", UDP_PORT_BABEL_OLD, babel_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index 99088bc5cd..a57def696c 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -1038,3 +1038,16 @@ proto_reg_handoff_beep(void) dissector_add_uint("tcp.port", global_beep_tcp_port, beep_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: + */ diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 6a1ebf5096..f611467106 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -4490,3 +4490,16 @@ proto_reg_handoff_ber(void) ber_update_oids(); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 59005a6c18..f8333444d4 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -924,3 +924,16 @@ proto_reg_handoff_bfd(void) dissector_add_uint("udp.port", UDP_PORT_BFD_1HOP_CONTROL, bfd_control_handle); dissector_add_uint("udp.port", UDP_PORT_BFD_MULTIHOP_CONTROL, bfd_control_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bluetooth-hci.h b/epan/dissectors/packet-bluetooth-hci.h index 837fcd9ef5..9051c20770 100644 --- a/epan/dissectors/packet-bluetooth-hci.h +++ b/epan/dissectors/packet-bluetooth-hci.h @@ -146,3 +146,16 @@ typedef struct _localhost_name_entry_t { extern gint dissect_bd_addr(gint hf_bd_addr, proto_tree *tree, tvbuff_t *tvb, gint offset); #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c index 39908eaca4..3b09a54bb1 100644 --- a/epan/dissectors/packet-bofl.c +++ b/epan/dissectors/packet-bofl.c @@ -133,3 +133,16 @@ proto_reg_handoff_bofl(void) bofl_handle = create_dissector_handle(dissect_bofl, proto_bofl); dissector_add_uint("ethertype", ETHER_TYPE_BOFL, bofl_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index 4c289c82dd..1b2ec01458 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -2574,3 +2574,16 @@ proto_reg_handoff_bssap(void) dissector_add_uint("sccp.ssn", global_bssap_ssn, bssap_plus_handle); old_bssap_ssn = global_bssap_ssn; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index b280bdb42b..9f05a9407d 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -372,3 +372,16 @@ proto_reg_handoff_slarp(void) slarp_handle = create_dissector_handle(dissect_slarp, proto_slarp); dissector_add_uint("chdlc.protocol", CISCO_SLARP, slarp_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: + */ diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 3b9738e36a..2510698de6 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -737,19 +737,19 @@ static void dissect_cimd_dcs(tvbuff_t *tvb, proto_tree *tree, gint pindex, gint static void dissect_cimd_error_code( tvbuff_t *tvb, proto_tree *tree, gint pindex, gint startOffset, gint endOffset ) { - /* Same routine can be used to dissect CIMD Error,Status and Status Error Codes */ - proto_tree *param_tree; - guint32 err_code; + /* Same routine can be used to dissect CIMD Error,Status and Status Error Codes */ + proto_tree *param_tree; + guint32 err_code; - param_tree = proto_tree_add_subtree(tree, tvb, startOffset + 1, endOffset - (startOffset + 1), - (*vals_hdr_PC[pindex].ett_p), NULL, cimd_vals_PC[pindex].strptr); + param_tree = proto_tree_add_subtree(tree, tvb, startOffset + 1, endOffset - (startOffset + 1), + (*vals_hdr_PC[pindex].ett_p), NULL, cimd_vals_PC[pindex].strptr); - proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); + proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); - err_code = (guint32) strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, - startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), ENC_ASCII), - NULL, 10); - proto_tree_add_uint(param_tree, (*vals_hdr_PC[pindex].hf_p), tvb, startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), err_code); + err_code = (guint32) strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, + startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), ENC_ASCII), + NULL, 10); + proto_tree_add_uint(param_tree, (*vals_hdr_PC[pindex].hf_p), tvb, startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), err_code); } static void @@ -1173,3 +1173,16 @@ proto_reg_handoff_cimd(void) cimd_handle = create_dissector_handle(dissect_cimd, proto_cimd); dissector_add_for_decode_as("tcp.port", cimd_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: + */ diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c index 8e0f1d9371..c4ac985e21 100644 --- a/epan/dissectors/packet-cosine.c +++ b/epan/dissectors/packet-cosine.c @@ -191,3 +191,16 @@ proto_reg_handoff_cosine(void) cosine_handle = create_dissector_handle(dissect_cosine, proto_cosine); dissector_add_uint("wtap_encap", WTAP_ENCAP_COSINE, cosine_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: + */ diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index 47d979480d..0b9ca10b42 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -219,7 +219,7 @@ static dissector_handle_t png_handle; /*XXX: Sorted by value definition since it appears that the "value" is just */ /* the ascii representation of the last 4 letters of the definition. */ -/* (Sorted so a binary search can be done when using value_string_ext) */ +* (Sorted so a binary search can be done when using value_string_ext) */ static const value_string vals_tag_code[] = { { daap_abal, "browse album listing" }, { daap_abar, "browse artist listing" }, @@ -740,3 +740,16 @@ proto_reg_handoff_daap(void) png_handle = find_dissector("png"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c index cabf6f3686..ec8cdfc4a9 100644 --- a/epan/dissectors/packet-dcerpc-ndr.c +++ b/epan/dissectors/packet-dcerpc-ndr.c @@ -577,3 +577,16 @@ dissect_ndr_ctx_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, } return offset + 20; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 17a6b37c72..c3102cde65 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -9461,3 +9461,16 @@ proto_reg_handoff_dcerpc_netlogon(void) DCE_C_RPC_AUTHN_PROTOCOL_SEC_CHAN, &secchan_auth_fns); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index 8065625e27..ba8e091210 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.c @@ -1611,3 +1611,16 @@ proto_reg_handoff_rs_pgo (void) dcerpc_init_uuid (proto_rs_pgo, ett_rs_pgo, &uuid_rs_pgo, ver_rs_pgo, rs_pgo_dissectors, hf_rs_pgo_opnum); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c index 4a0d84a7d4..b35e49c643 100644 --- a/epan/dissectors/packet-dcom-oxid.c +++ b/epan/dissectors/packet-dcom-oxid.c @@ -338,3 +338,16 @@ proto_reg_handoff_oxid (void) /* Register the protocol as dcerpc */ dcerpc_init_uuid (proto_oxid, ett_oxid, &uuid_oxid, ver_oxid, oxid_dissectors, hf_oxid_opnum); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 44ac975112..00987a7072 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -413,3 +413,16 @@ proto_reg_handoff_distcc(void) distcc_tcp_port = glb_distcc_tcp_port; dissector_add_uint("tcp.port", distcc_tcp_port, distcc_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index 2d4245ddbc..778e6f15b4 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -3030,3 +3030,16 @@ proto_register_e212(void) expert_register_field_array(expert_e212, ei, array_length(ei)); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-epon.c b/epan/dissectors/packet-epon.c index 1733384fe6..fbdff86833 100644 --- a/epan/dissectors/packet-epon.c +++ b/epan/dissectors/packet-epon.c @@ -294,3 +294,16 @@ proto_reg_handoff_epon(void) eth_handle = find_dissector("eth"); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index a6be1fcdc7..8e18a214e8 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -690,3 +690,16 @@ void proto_reg_handoff_erldp(void) { dissector_add_for_decode_as("tcp.port", erldp_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: + */ diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c index 666cf14acc..3377c11050 100644 --- a/epan/dissectors/packet-esis.c +++ b/epan/dissectors/packet-esis.c @@ -422,3 +422,16 @@ proto_reg_handoff_esis(void) esis_handle = find_dissector("esis"); dissector_add_uint("osinl.incl", NLPID_ISO9542_ESIS, esis_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: + */ diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 30773c5e91..a972e3999e 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -100,27 +100,27 @@ static int eth_tap = -1; #define ETH_HEADER_SIZE 14 static const true_false_string ig_tfs = { - "Group address (multicast/broadcast)", - "Individual address (unicast)" + "Group address (multicast/broadcast)", + "Individual address (unicast)" }; static const true_false_string lg_tfs = { - "Locally administered address (this is NOT the factory default)", - "Globally unique address (factory default)" + "Locally administered address (this is NOT the factory default)", + "Globally unique address (factory default)" }; static const char* eth_conv_get_filter_type(conv_item_t* conv, conv_filter_type_e filter) { - if ((filter == CONV_FT_SRC_ADDRESS) && (conv->src_address.type == AT_ETHER)) - return "eth.src"; + if ((filter == CONV_FT_SRC_ADDRESS) && (conv->src_address.type == AT_ETHER)) + return "eth.src"; - if ((filter == CONV_FT_DST_ADDRESS) && (conv->dst_address.type == AT_ETHER)) - return "eth.dst"; + if ((filter == CONV_FT_DST_ADDRESS) && (conv->dst_address.type == AT_ETHER)) + return "eth.dst"; - if ((filter == CONV_FT_ANY_ADDRESS) && (conv->src_address.type == AT_ETHER)) - return "eth.addr"; + if ((filter == CONV_FT_ANY_ADDRESS) && (conv->src_address.type == AT_ETHER)) + return "eth.addr"; - return CONV_FILTER_INVALID; + return CONV_FILTER_INVALID; } static ct_dissector_info_t eth_ct_dissector_info = {ð_conv_get_filter_type}; @@ -128,20 +128,20 @@ static ct_dissector_info_t eth_ct_dissector_info = {ð_conv_get_filter_type}; static int eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) { - conv_hash_t *hash = (conv_hash_t*) pct; - const eth_hdr *ehdr=(const eth_hdr *)vip; + conv_hash_t *hash = (conv_hash_t*) pct; + const eth_hdr *ehdr=(const eth_hdr *)vip; - add_conversation_table_data(hash, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, ð_ct_dissector_info, PT_NONE); + add_conversation_table_data(hash, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, ð_ct_dissector_info, PT_NONE); - return 1; + return 1; } static const char* eth_host_get_filter_type(hostlist_talker_t* host, conv_filter_type_e filter) { - if ((filter == CONV_FT_ANY_ADDRESS) && (host->myaddress.type == AT_ETHER)) - return "eth.addr"; + if ((filter == CONV_FT_ANY_ADDRESS) && (host->myaddress.type == AT_ETHER)) + return "eth.addr"; - return CONV_FILTER_INVALID; + return CONV_FILTER_INVALID; } static hostlist_dissector_info_t eth_host_dissector_info = {ð_host_get_filter_type}; @@ -149,16 +149,16 @@ static hostlist_dissector_info_t eth_host_dissector_info = {ð_host_get_filter static int eth_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) { - conv_hash_t *hash = (conv_hash_t*) pit; - const eth_hdr *ehdr=(const eth_hdr *)vip; + conv_hash_t *hash = (conv_hash_t*) pit; + const eth_hdr *ehdr=(const eth_hdr *)vip; - /* Take two "add" passes per packet, adding for each direction, ensures that all - packets are counted properly (even if address is sending to itself) - XXX - this could probably be done more efficiently inside hostlist_table */ - add_hostlist_table_data(hash, &ehdr->src, 0, TRUE, 1, pinfo->fd->pkt_len, ð_host_dissector_info, PT_NONE); - add_hostlist_table_data(hash, &ehdr->dst, 0, FALSE, 1, pinfo->fd->pkt_len, ð_host_dissector_info, PT_NONE); + /* Take two "add" passes per packet, adding for each direction, ensures that all + packets are counted properly (even if address is sending to itself) + XXX - this could probably be done more efficiently inside hostlist_table */ + add_hostlist_table_data(hash, &ehdr->src, 0, TRUE, 1, pinfo->fd->pkt_len, ð_host_dissector_info, PT_NONE); + add_hostlist_table_data(hash, &ehdr->dst, 0, FALSE, 1, pinfo->fd->pkt_len, ð_host_dissector_info, PT_NONE); - return 1; + return 1; } @@ -835,203 +835,216 @@ dissect_eth_withfcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_eth(void) { - static hf_register_info hf[] = { - - { &hf_eth_dst, - { "Destination", "eth.dst", FT_ETHER, BASE_NONE, NULL, 0x0, - "Destination Hardware Address", HFILL }}, - - { &hf_eth_dst_resolved, - { "Destination (resolved)", "eth.dst_resolved", FT_STRING, BASE_NONE, - NULL, 0x0, "Destination Hardware Address (resolved)", HFILL }}, - - { &hf_eth_src, - { "Source", "eth.src", FT_ETHER, BASE_NONE, NULL, 0x0, - "Source Hardware Address", HFILL }}, - - { &hf_eth_src_resolved, - { "Source (resolved)", "eth.src_resolved", FT_STRING, BASE_NONE, - NULL, 0x0, "Source Hardware Address (resolved)", HFILL }}, - - { &hf_eth_len, - { "Length", "eth.len", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL }}, - - /* registered here but handled in packet-ethertype.c */ - { &hf_eth_type, - { "Type", "eth.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, - NULL, HFILL }}, - - { &hf_eth_invalid_lentype, - { "Invalid length/type", "eth.invalid_lentype", FT_UINT16, BASE_HEX_DEC, - NULL, 0x0, NULL, HFILL }}, - - { &hf_eth_addr, - { "Address", "eth.addr", FT_ETHER, BASE_NONE, NULL, 0x0, - "Source or Destination Hardware Address", HFILL }}, - - { &hf_eth_addr_resolved, - { "Address (resolved)", "eth.addr_resolved", FT_STRING, BASE_NONE, - NULL, 0x0, "Source or Destination Hardware Address (resolved)", - HFILL }}, - - { &hf_eth_padding, - { "Padding", "eth.padding", FT_BYTES, BASE_NONE, NULL, 0x0, - "Ethernet Padding", HFILL }}, - - { &hf_eth_trailer, - { "Trailer", "eth.trailer", FT_BYTES, BASE_NONE, NULL, 0x0, - "Ethernet Trailer or Checksum", HFILL }}, - - { &hf_eth_fcs, - { "Frame check sequence", "eth.fcs", FT_UINT32, BASE_HEX, NULL, 0x0, - "Ethernet checksum", HFILL }}, - - { &hf_eth_fcs_good, - { "FCS Good", "eth.fcs_good", FT_BOOLEAN, BASE_NONE, NULL, 0x0, - "True: checksum matches packet content; False: doesn't match content or not checked", HFILL }}, - - { &hf_eth_fcs_bad, - { "FCS Bad", "eth.fcs_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0, - "True: checksum doesn't matche packet content; False: does match content or not checked", HFILL }}, - - { &hf_eth_lg, - { "LG bit", "eth.lg", FT_BOOLEAN, 24, - TFS(&lg_tfs), 0x020000, - "Specifies if this is a locally administered or globally unique (IEEE assigned) address", HFILL }}, - - { &hf_eth_ig, - { "IG bit", "eth.ig", FT_BOOLEAN, 24, - TFS(&ig_tfs), 0x010000, - "Specifies if this is an individual (unicast) or group (broadcast/multicast) address", HFILL }} - }; - static gint *ett[] = { - &ett_ieee8023, - &ett_ether2, - &ett_ether, - &ett_addr, - &ett_eth_fcs - }; - - static ei_register_info ei[] = { - { &ei_eth_invalid_lentype, { "eth.invalid_lentype", PI_PROTOCOL, PI_WARN, "Invalid length/type", EXPFILL }}, - { &ei_eth_src_not_group, { "eth.src_not_group", PI_PROTOCOL, PI_WARN, "Source MAC must not be a group address: IEEE 802.3-2002, Section 3.2.3(b)", EXPFILL }}, - { &ei_eth_fcs_bad, { "eth.fcs_bad.expert", PI_CHECKSUM, PI_ERROR, "Bad checksum", EXPFILL }}, - { &ei_eth_len, { "eth.len.past_end", PI_MALFORMED, PI_ERROR, "Length field value goes past the end of the payload", EXPFILL }}, - }; - - module_t *eth_module; - expert_module_t* expert_eth; - - proto_eth = proto_register_protocol("Ethernet", "Ethernet", "eth"); - proto_register_field_array(proto_eth, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); - expert_eth = expert_register_protocol(proto_eth); - expert_register_field_array(expert_eth, ei, array_length(ei)); - - /* subdissector code */ - register_heur_dissector_list("eth", &heur_subdissector_list); - register_heur_dissector_list("eth.trailer", ð_trailer_subdissector_list); - - /* Register configuration preferences */ - eth_module = prefs_register_protocol(proto_eth, NULL); - - prefs_register_bool_preference(eth_module, "assume_padding", - "Assume short frames which include a trailer contain padding", - "Some devices add trailing data to frames. When this setting is checked " - "the Ethernet dissector will assume there has been added padding to the " - "frame before the trailer was added. Uncheck if a device added a trailer " - "before the frame was padded.", - ð_assume_padding); - - prefs_register_uint_preference(eth_module, "trailer_length", - "Fixed ethernet trailer length", - "Some TAPs add a fixed length ethernet trailer at the end " - "of the frame, but before the (optional) FCS. Make sure it " - "gets interpreted correctly.", - 10, ð_trailer_length); - - prefs_register_bool_preference(eth_module, "assume_fcs", - "Assume packets have FCS", - "Some Ethernet adapters and drivers include the FCS at the end of a packet, others do not. " - "The Ethernet dissector attempts to guess whether a captured packet has an FCS, " - "but it cannot always guess correctly.", - ð_assume_fcs); - - prefs_register_bool_preference(eth_module, "check_fcs", - "Validate the Ethernet checksum if possible", - "Whether to validate the Frame Check Sequence", - ð_check_fcs); - - prefs_register_bool_preference(eth_module, "interpret_as_fw1_monitor", - "Attempt to interpret as FireWall-1 monitor file", - "Whether packets should be interpreted as coming from CheckPoint FireWall-1 monitor file if they look as if they do", - ð_interpret_as_fw1_monitor); - - prefs_register_static_text_preference(eth_module, "ccsds_heuristic", - "These are the conditions to match a payload against in order to determine if this\n" - "is a CCSDS (Consultative Committee for Space Data Systems) packet within\n" - "an 802.3 packet. A packet is considered as a possible CCSDS packet only if\n" - "one or more of the conditions are checked.", - "Describe the conditions that must be true for the CCSDS dissector to be called"); - - prefs_register_bool_preference(eth_module, "ccsds_heuristic_length", - "CCSDS Length in header matches payload size", - "Set the condition that must be true for the CCSDS dissector to be called", - &ccsds_heuristic_length); - - prefs_register_bool_preference(eth_module, "ccsds_heuristic_version", - "CCSDS Version # is zero", - "Set the condition that must be true for the CCSDS dissector to be called", - &ccsds_heuristic_version); - - prefs_register_bool_preference(eth_module, "ccsds_heuristic_header", - "CCSDS Secondary Header Flag is set", - "Set the condition that must be true for the CCSDS dissector to be called", - &ccsds_heuristic_header); - - prefs_register_bool_preference(eth_module, "ccsds_heuristic_bit", - "CCSDS Spare bit is cleared", - "Set the condition that must be true for the CCSDS dissector to be called", - &ccsds_heuristic_bit); - - register_dissector("eth_withoutfcs", dissect_eth_withoutfcs, proto_eth); - register_dissector("eth_withfcs", dissect_eth_withfcs, proto_eth); - register_dissector("eth", dissect_eth_maybefcs, proto_eth); - eth_tap = register_tap("eth"); - - register_conversation_table(proto_eth, TRUE, eth_conversation_packet, eth_hostlist_packet, NULL); + static hf_register_info hf[] = { + + { &hf_eth_dst, + { "Destination", "eth.dst", FT_ETHER, BASE_NONE, NULL, 0x0, + "Destination Hardware Address", HFILL }}, + + { &hf_eth_dst_resolved, + { "Destination (resolved)", "eth.dst_resolved", FT_STRING, BASE_NONE, + NULL, 0x0, "Destination Hardware Address (resolved)", HFILL }}, + + { &hf_eth_src, + { "Source", "eth.src", FT_ETHER, BASE_NONE, NULL, 0x0, + "Source Hardware Address", HFILL }}, + + { &hf_eth_src_resolved, + { "Source (resolved)", "eth.src_resolved", FT_STRING, BASE_NONE, + NULL, 0x0, "Source Hardware Address (resolved)", HFILL }}, + + { &hf_eth_len, + { "Length", "eth.len", FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL }}, + + /* registered here but handled in packet-ethertype.c */ + { &hf_eth_type, + { "Type", "eth.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, + NULL, HFILL }}, + + { &hf_eth_invalid_lentype, + { "Invalid length/type", "eth.invalid_lentype", FT_UINT16, BASE_HEX_DEC, + NULL, 0x0, NULL, HFILL }}, + + { &hf_eth_addr, + { "Address", "eth.addr", FT_ETHER, BASE_NONE, NULL, 0x0, + "Source or Destination Hardware Address", HFILL }}, + + { &hf_eth_addr_resolved, + { "Address (resolved)", "eth.addr_resolved", FT_STRING, BASE_NONE, + NULL, 0x0, "Source or Destination Hardware Address (resolved)", + HFILL }}, + + { &hf_eth_padding, + { "Padding", "eth.padding", FT_BYTES, BASE_NONE, NULL, 0x0, + "Ethernet Padding", HFILL }}, + + { &hf_eth_trailer, + { "Trailer", "eth.trailer", FT_BYTES, BASE_NONE, NULL, 0x0, + "Ethernet Trailer or Checksum", HFILL }}, + + { &hf_eth_fcs, + { "Frame check sequence", "eth.fcs", FT_UINT32, BASE_HEX, NULL, 0x0, + "Ethernet checksum", HFILL }}, + + { &hf_eth_fcs_good, + { "FCS Good", "eth.fcs_good", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + "True: checksum matches packet content; False: doesn't match content or not checked", HFILL }}, + + { &hf_eth_fcs_bad, + { "FCS Bad", "eth.fcs_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + "True: checksum doesn't matche packet content; False: does match content or not checked", HFILL }}, + + { &hf_eth_lg, + { "LG bit", "eth.lg", FT_BOOLEAN, 24, + TFS(&lg_tfs), 0x020000, + "Specifies if this is a locally administered or globally unique (IEEE assigned) address", HFILL }}, + + { &hf_eth_ig, + { "IG bit", "eth.ig", FT_BOOLEAN, 24, + TFS(&ig_tfs), 0x010000, + "Specifies if this is an individual (unicast) or group (broadcast/multicast) address", HFILL }} + }; + static gint *ett[] = { + &ett_ieee8023, + &ett_ether2, + &ett_ether, + &ett_addr, + &ett_eth_fcs + }; + + static ei_register_info ei[] = { + { &ei_eth_invalid_lentype, { "eth.invalid_lentype", PI_PROTOCOL, PI_WARN, "Invalid length/type", EXPFILL }}, + { &ei_eth_src_not_group, { "eth.src_not_group", PI_PROTOCOL, PI_WARN, "Source MAC must not be a group address: IEEE 802.3-2002, Section 3.2.3(b)", EXPFILL }}, + { &ei_eth_fcs_bad, { "eth.fcs_bad.expert", PI_CHECKSUM, PI_ERROR, "Bad checksum", EXPFILL }}, + { &ei_eth_len, { "eth.len.past_end", PI_MALFORMED, PI_ERROR, "Length field value goes past the end of the payload", EXPFILL }}, + }; + + module_t *eth_module; + expert_module_t* expert_eth; + + proto_eth = proto_register_protocol("Ethernet", "Ethernet", "eth"); + proto_register_field_array(proto_eth, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + expert_eth = expert_register_protocol(proto_eth); + expert_register_field_array(expert_eth, ei, array_length(ei)); + + /* subdissector code */ + register_heur_dissector_list("eth", &heur_subdissector_list); + register_heur_dissector_list("eth.trailer", ð_trailer_subdissector_list); + + /* Register configuration preferences */ + eth_module = prefs_register_protocol(proto_eth, NULL); + + prefs_register_bool_preference(eth_module, "assume_padding", + "Assume short frames which include a trailer contain padding", + "Some devices add trailing data to frames. When this setting is checked " + "the Ethernet dissector will assume there has been added padding to the " + "frame before the trailer was added. Uncheck if a device added a trailer " + "before the frame was padded.", + ð_assume_padding); + + prefs_register_uint_preference(eth_module, "trailer_length", + "Fixed ethernet trailer length", + "Some TAPs add a fixed length ethernet trailer at the end " + "of the frame, but before the (optional) FCS. Make sure it " + "gets interpreted correctly.", + 10, ð_trailer_length); + + prefs_register_bool_preference(eth_module, "assume_fcs", + "Assume packets have FCS", + "Some Ethernet adapters and drivers include the FCS at the end of a packet, others do not. " + "The Ethernet dissector attempts to guess whether a captured packet has an FCS, " + "but it cannot always guess correctly.", + ð_assume_fcs); + + prefs_register_bool_preference(eth_module, "check_fcs", + "Validate the Ethernet checksum if possible", + "Whether to validate the Frame Check Sequence", + ð_check_fcs); + + prefs_register_bool_preference(eth_module, "interpret_as_fw1_monitor", + "Attempt to interpret as FireWall-1 monitor file", + "Whether packets should be interpreted as coming from CheckPoint FireWall-1 monitor file if they look as if they do", + ð_interpret_as_fw1_monitor); + + prefs_register_static_text_preference(eth_module, "ccsds_heuristic", + "These are the conditions to match a payload against in order to determine if this\n" + "is a CCSDS (Consultative Committee for Space Data Systems) packet within\n" + "an 802.3 packet. A packet is considered as a possible CCSDS packet only if\n" + "one or more of the conditions are checked.", + "Describe the conditions that must be true for the CCSDS dissector to be called"); + + prefs_register_bool_preference(eth_module, "ccsds_heuristic_length", + "CCSDS Length in header matches payload size", + "Set the condition that must be true for the CCSDS dissector to be called", + &ccsds_heuristic_length); + + prefs_register_bool_preference(eth_module, "ccsds_heuristic_version", + "CCSDS Version # is zero", + "Set the condition that must be true for the CCSDS dissector to be called", + &ccsds_heuristic_version); + + prefs_register_bool_preference(eth_module, "ccsds_heuristic_header", + "CCSDS Secondary Header Flag is set", + "Set the condition that must be true for the CCSDS dissector to be called", + &ccsds_heuristic_header); + + prefs_register_bool_preference(eth_module, "ccsds_heuristic_bit", + "CCSDS Spare bit is cleared", + "Set the condition that must be true for the CCSDS dissector to be called", + &ccsds_heuristic_bit); + + register_dissector("eth_withoutfcs", dissect_eth_withoutfcs, proto_eth); + register_dissector("eth_withfcs", dissect_eth_withfcs, proto_eth); + register_dissector("eth", dissect_eth_maybefcs, proto_eth); + eth_tap = register_tap("eth"); + + register_conversation_table(proto_eth, TRUE, eth_conversation_packet, eth_hostlist_packet, NULL); } void proto_reg_handoff_eth(void) { - dissector_handle_t eth_maybefcs_handle, eth_withoutfcs_handle; + dissector_handle_t eth_maybefcs_handle, eth_withoutfcs_handle; - /* Get a handle for the Firewall-1 dissector. */ - fw1_handle = find_dissector("fw1"); + /* Get a handle for the Firewall-1 dissector. */ + fw1_handle = find_dissector("fw1"); - /* Get a handle for the ethertype dissector. */ - ethertype_handle = find_dissector("ethertype"); + /* Get a handle for the ethertype dissector. */ + ethertype_handle = find_dissector("ethertype"); - /* Get a handle for the generic data dissector. */ - data_handle = find_dissector("data"); + /* Get a handle for the generic data dissector. */ + data_handle = find_dissector("data"); - eth_maybefcs_handle = find_dissector("eth"); - dissector_add_uint("wtap_encap", WTAP_ENCAP_ETHERNET, eth_maybefcs_handle); + eth_maybefcs_handle = find_dissector("eth"); + dissector_add_uint("wtap_encap", WTAP_ENCAP_ETHERNET, eth_maybefcs_handle); - eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - dissector_add_uint("ethertype", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle); - dissector_add_uint("erf.types.type", ERF_TYPE_ETH, eth_withoutfcs_handle); - dissector_add_uint("chdlc.protocol", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle); - dissector_add_uint("gre.proto", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle); + eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); + dissector_add_uint("ethertype", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle); + dissector_add_uint("erf.types.type", ERF_TYPE_ETH, eth_withoutfcs_handle); + dissector_add_uint("chdlc.protocol", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle); + dissector_add_uint("gre.proto", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle); - dissector_add_uint("sll.ltype", LINUX_SLL_P_ETHERNET, eth_withoutfcs_handle); + dissector_add_uint("sll.ltype", LINUX_SLL_P_ETHERNET, eth_withoutfcs_handle); - /* - * This is to handle the output for the Cisco CMTS "cable intercept" - * command - it encapsulates Ethernet frames in UDP packets, but - * the UDP port is user-defined. - */ - dissector_add_for_decode_as("udp.port", eth_withoutfcs_handle); + /* + * This is to handle the output for the Cisco CMTS "cable intercept" + * command - it encapsulates Ethernet frames in UDP packets, but + * the UDP port is user-defined. + */ + dissector_add_for_decode_as("udp.port", eth_withoutfcs_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: + */ diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index e4a5b512be..2b0787275a 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -1649,3 +1649,16 @@ proto_reg_handoff_fc (void) data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 5c468021cb..5aba809604 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -1971,3 +1971,16 @@ proto_reg_handoff_fcdns (void) dissector_add_uint("fcct.server", FCCT_GSRVR_DNS, dns_handle); dissector_add_uint("fcct.server", FCCT_GSRVR_UNS, dns_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index c2c1655ca8..1d3ee27a62 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -1103,3 +1103,16 @@ proto_reg_handoff_fcfcs (void) data_handle = find_dissector ("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index 532bd72c2b..75a484bee5 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -946,4 +946,15 @@ proto_reg_handoff_fcfzs(void) data_handle = find_dissector("data"); } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index a7ce950b62..c89934c1ce 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -420,3 +420,16 @@ proto_reg_handoff_fcgi(void) saved_tcp_port = tcp_port; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 4778c5640e..59c7511848 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -660,3 +660,16 @@ proto_reg_handoff_fcip (void) data_handle = find_dissector("data"); fc_handle = find_dissector("fc"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index ac05a98234..e793f5b3a9 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -341,3 +341,16 @@ proto_reg_handoff_fcoe(void) data_handle = find_dissector("data"); fc_handle = find_dissector("fc"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c index c95bd27538..c30d190cc7 100644 --- a/epan/dissectors/packet-fcoib.c +++ b/epan/dissectors/packet-fcoib.c @@ -456,3 +456,16 @@ proto_reg_handoff_fcoib(void) } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 0b56b07763..ec9d8971b9 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -2550,3 +2550,16 @@ proto_reg_handoff_fcswils(void) data_handle = find_dissector("data"); fcsp_handle = find_dissector("fcsp"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index bf4652738d..739828677e 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -145,16 +145,16 @@ swap_mac_addr(guint8 *swapped_addr, tvbuff_t *tvb, gint offset) static const char* fddi_conv_get_filter_type(conv_item_t* conv, conv_filter_type_e filter) { - if ((filter == CONV_FT_SRC_ADDRESS) && (conv->src_address.type == AT_ETHER)) - return "fddi.src"; + if ((filter == CONV_FT_SRC_ADDRESS) && (conv->src_address.type == AT_ETHER)) + return "fddi.src"; - if ((filter == CONV_FT_DST_ADDRESS) && (conv->dst_address.type == AT_ETHER)) - return "fddi.dst"; + if ((filter == CONV_FT_DST_ADDRESS) && (conv->dst_address.type == AT_ETHER)) + return "fddi.dst"; - if ((filter == CONV_FT_ANY_ADDRESS) && (conv->src_address.type == AT_ETHER)) - return "fddi.addr"; + if ((filter == CONV_FT_ANY_ADDRESS) && (conv->src_address.type == AT_ETHER)) + return "fddi.addr"; - return CONV_FILTER_INVALID; + return CONV_FILTER_INVALID; } static ct_dissector_info_t fddi_ct_dissector_info = {&fddi_conv_get_filter_type}; @@ -551,3 +551,16 @@ proto_reg_handoff_fddi(void) dissector_add_uint("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED, fddi_bitswapped_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: + */ diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index b11ffa509e..1871a0a501 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -292,3 +292,16 @@ proto_reg_handoff_fefd(void) fefd_handle = create_dissector_handle(dissect_fefd, proto_fefd); dissector_add_uint("llc.force10_pid", 0x0111, fefd_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 1c707034ed..380e0c188e 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -15318,3 +15318,16 @@ proto_reg_handoff_ff(void) */ dissector_add_uint("udp.port", UDP_PORT_FF_LR_PORT, ff_udp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index dae528f04f..81db1a35ab 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -825,3 +825,16 @@ proto_reg_handoff_fip(void) dissector_add_uint("ethertype", ETHERTYPE_FIP, fip_handle); fc_handle = find_dissector("fc"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index c96b7c3840..7b3718ec5d 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -785,4 +785,15 @@ proto_reg_handoff_flip(void) } /* proto_reg_handoff_flip() */ -/* end of file packet-flip.c */ +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index b43220f55e..6ca9e58dbc 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -1018,3 +1018,16 @@ proto_reg_handoff_fr(void) osinl_incl_subdissector_table = find_dissector_table("osinl.incl"); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c index 8d1b62c1c3..da847f85e1 100644 --- a/epan/dissectors/packet-gmhdr.c +++ b/epan/dissectors/packet-gmhdr.c @@ -522,3 +522,15 @@ proto_reg_handoff_gmhdr(void) heur_dissector_add("eth.trailer", dissect_gmtimestamp_trailer, proto_gmtrailer); } +/* + * 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: + */ diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index 7d9d1aad3d..1030af784b 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -403,3 +403,16 @@ void proto_reg_handoff_gmrp(void){ data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index c14acba526..029cb605be 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -213,8 +213,8 @@ static const true_false_string gre_wccp_alternative_bucket_used_val = { }; static const true_false_string gre_wccp_redirect_header_valid_val = { - "Header is present, but ignore contents", - "Header contents are valid", + "Header is present, but ignore contents", + "Header contents are valid", }; @@ -750,3 +750,16 @@ proto_reg_handoff_gre(void) dissector_add_uint("ip.proto", IP_PROTO_GRE, gre_handle); data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index aa53f14466..ff8ece0aad 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -4486,3 +4486,15 @@ proto_register_gsm_a_common(void) gsm_a_tap = register_tap("gsm_a"); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index 6baf74e098..d2782a2b25 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -662,3 +662,16 @@ proto_reg_handoff_gsm_sms_ud(void) wsp_handle = find_dissector("wsp-cl"); DISSECTOR_ASSERT(wsp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c index a1172c3b8c..65227513e7 100644 --- a/epan/dissectors/packet-h221_nonstd.c +++ b/epan/dissectors/packet-h221_nonstd.c @@ -138,3 +138,16 @@ proto_reg_handoff_nonstd(void) dissector_add_uint("h225.nsp.h221",0xb500534c, ms_nonstd_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index 2ef8840eb8..db46cee8d5 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -2191,3 +2191,16 @@ proto_register_homeplug(void) expert_homeplug = expert_register_protocol(proto_homeplug); expert_register_field_array(expert_homeplug, ei, array_length(ei)); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 1e195e0f4e..3c92febad1 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -1370,3 +1370,16 @@ void proto_reg_handoff_icep(void) old_icep_udp_port = icep_udp_port; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index 46f6c977f1..aeaab32ebf 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -412,3 +412,16 @@ void proto_reg_handoff_1722(void) avbtp_handle = create_dissector_handle(dissect_1722, proto_1722); dissector_add_uint("ethertype", ETHERTYPE_AVBTP, avbtp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index e4a2d6fd4b..51d4ded44f 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -1279,3 +1279,16 @@ proto_reg_handoff_imf(void) media_type_dissector_table = find_dissector_table("media_type"); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 84b657b4bc..e0a4e127a2 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -7527,3 +7527,16 @@ void proto_reg_handoff_infiniband(void) dissector_add_uint("wtap_encap", WTAP_ENCAP_INFINIBAND, ib_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-infiniband.h b/epan/dissectors/packet-infiniband.h index c9ca0c2c13..87a2505f2b 100644 --- a/epan/dissectors/packet-infiniband.h +++ b/epan/dissectors/packet-infiniband.h @@ -117,3 +117,16 @@ struct infinibandinfo { }; #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-ip.h b/epan/dissectors/packet-ip.h index 23c8f379be..d473e36d03 100644 --- a/epan/dissectors/packet-ip.h +++ b/epan/dissectors/packet-ip.h @@ -48,3 +48,16 @@ void capture_ip(const guchar *, int, int, packet_counts *); WS_DLL_PUBLIC value_string_ext dscp_vals_ext; #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 7e27f1b3b8..92f58c35bb 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -723,3 +723,16 @@ proto_reg_handoff_ipp(void) dissector_add_string("media_type", "application/ipp", ipp_handle); data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c index 78eb0275e2..6c9dd7bce7 100644 --- a/epan/dissectors/packet-ipsec-udp.c +++ b/epan/dissectors/packet-ipsec-udp.c @@ -110,3 +110,16 @@ proto_reg_handoff_udpencap(void) udpencap_handle = create_dissector_handle(dissect_udpencap, proto_udpencap); dissector_add_uint("udp.port", 4500, udpencap_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: + */ diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 6a4b5fb961..878e856918 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -3121,3 +3121,16 @@ proto_reg_handoff_iscsi(void) iscsi_handle = new_create_dissector_handle(dissect_iscsi_handle, proto_iscsi); dissector_add_for_decode_as("tcp.port", iscsi_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c index 83c7dc0f02..de0ae1ff04 100644 --- a/epan/dissectors/packet-iua.c +++ b/epan/dissectors/packet-iua.c @@ -995,3 +995,16 @@ proto_reg_handoff_iua(void) data_handle = find_dissector("data"); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-ixiatrailer.c b/epan/dissectors/packet-ixiatrailer.c index 07e843b217..3e98835ecf 100644 --- a/epan/dissectors/packet-ixiatrailer.c +++ b/epan/dissectors/packet-ixiatrailer.c @@ -75,87 +75,87 @@ static expert_field ei_ixiatrailer_field_length_invalid = EI_INIT; static int dissect_ixiatrailer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_tree *ti; - guint tvblen, trailer_length, time_length; - proto_tree *ixiatrailer_tree = NULL; - guint offset = 0; - guint16 cksum, comp_cksum; - vec_t vec; - guint8 source; - - /* Need at least 5 bytes. TODO: should be 15? */ - tvblen = tvb_length(tvb); - if (tvblen < 5) { - return 0; - } - - /* Depending upon the ethernet preference "Assume packets have FCS", we - may be given those 4 bytes too. If we see 19 bytes, assume we are - getting them and only look at first 15. */ - if (tvblen == 19) { - tvblen = 15; - } - - /* 3rd & 4th bytes from the end must match our pattern */ - if (tvb_get_ntohs(tvb, tvblen-4) != IXIA_PATTERN) { - return 0; - } - - /* Read Trailer-length field */ - trailer_length = tvb_get_guint8(tvb, tvblen-5); - /* Should match overall length of trailer */ - if ((tvblen-5) != trailer_length) { - return 0; - } - - /* Last 2 bytes are the checksum */ - cksum = tvb_get_ntohs(tvb, tvblen-2); - - /* Verify the checksum; if not valid, it means that the trailer is not valid */ - SET_CKSUM_VEC_TVB(vec, tvb, offset, trailer_length + 3); - comp_cksum = in_cksum(&vec, 1); - if (pntoh16(&comp_cksum) != cksum) { - return 0; - } - - /* OK: We have our trailer - create protocol root */ - ti = proto_tree_add_item(tree, proto_ixiatrailer, tvb, offset, trailer_length + 5, ENC_NA); - - /* Append summary to item, if configured to */ - if (ixiatrailer_summary_in_tree) { - proto_item_append_text(ti, ", Length: %u, Checksum: 0x%x", trailer_length, cksum); - } - - /* Create subtree */ - ixiatrailer_tree = proto_item_add_subtree(ti, ett_ixiatrailer); - - source = tvb_get_guint8(tvb, offset++); - time_length = tvb_get_guint8(tvb, offset++); - - switch (source) { - case IXIATRAILER_FTYPE_TIMESTAMP_LOCAL: - case IXIATRAILER_FTYPE_TIMESTAMP_NTP: - case IXIATRAILER_FTYPE_TIMESTAMP_GPS: - case IXIATRAILER_FTYPE_TIMESTAMP_1588: - case IXIATRAILER_FTYPE_TIMESTAMP_HOLDOVER: - if (time_length != 8) { - expert_add_info_format(pinfo, ti, &ei_ixiatrailer_field_length_invalid, "Field length %u invalid", time_length); - break; - } - /* Timestamp */ - ti = proto_tree_add_item(ixiatrailer_tree, hf_ixiatrailer_timestamp, tvb, offset, time_length, ENC_TIME_TIMESPEC|ENC_BIG_ENDIAN); - proto_item_append_text(ti, "; Source: %s", val_to_str_const(source, ixiatrailer_ftype_timestamp, "Unknown")); - break; - - default: - /* Not a recognised time format - just show as bytes */ - ti = proto_tree_add_item(ixiatrailer_tree, hf_ixiatrailer_generic, tvb, offset, time_length, ENC_NA); - proto_item_append_text(ti, " [Id: %u, Length: %u]", source, time_length); - break; - } - - /* We are claiming all of the bytes */ - return tvblen; + proto_tree *ti; + guint tvblen, trailer_length, time_length; + proto_tree *ixiatrailer_tree = NULL; + guint offset = 0; + guint16 cksum, comp_cksum; + vec_t vec; + guint8 source; + + /* Need at least 5 bytes. TODO: should be 15? */ + tvblen = tvb_length(tvb); + if (tvblen < 5) { + return 0; + } + + /* Depending upon the ethernet preference "Assume packets have FCS", we + may be given those 4 bytes too. If we see 19 bytes, assume we are + getting them and only look at first 15. */ + if (tvblen == 19) { + tvblen = 15; + } + + /* 3rd & 4th bytes from the end must match our pattern */ + if (tvb_get_ntohs(tvb, tvblen-4) != IXIA_PATTERN) { + return 0; + } + + /* Read Trailer-length field */ + trailer_length = tvb_get_guint8(tvb, tvblen-5); + /* Should match overall length of trailer */ + if ((tvblen-5) != trailer_length) { + return 0; + } + + /* Last 2 bytes are the checksum */ + cksum = tvb_get_ntohs(tvb, tvblen-2); + + /* Verify the checksum; if not valid, it means that the trailer is not valid */ + SET_CKSUM_VEC_TVB(vec, tvb, offset, trailer_length + 3); + comp_cksum = in_cksum(&vec, 1); + if (pntoh16(&comp_cksum) != cksum) { + return 0; + } + + /* OK: We have our trailer - create protocol root */ + ti = proto_tree_add_item(tree, proto_ixiatrailer, tvb, offset, trailer_length + 5, ENC_NA); + + /* Append summary to item, if configured to */ + if (ixiatrailer_summary_in_tree) { + proto_item_append_text(ti, ", Length: %u, Checksum: 0x%x", trailer_length, cksum); + } + + /* Create subtree */ + ixiatrailer_tree = proto_item_add_subtree(ti, ett_ixiatrailer); + + source = tvb_get_guint8(tvb, offset++); + time_length = tvb_get_guint8(tvb, offset++); + + switch (source) { + case IXIATRAILER_FTYPE_TIMESTAMP_LOCAL: + case IXIATRAILER_FTYPE_TIMESTAMP_NTP: + case IXIATRAILER_FTYPE_TIMESTAMP_GPS: + case IXIATRAILER_FTYPE_TIMESTAMP_1588: + case IXIATRAILER_FTYPE_TIMESTAMP_HOLDOVER: + if (time_length != 8) { + expert_add_info_format(pinfo, ti, &ei_ixiatrailer_field_length_invalid, "Field length %u invalid", time_length); + break; + } + /* Timestamp */ + ti = proto_tree_add_item(ixiatrailer_tree, hf_ixiatrailer_timestamp, tvb, offset, time_length, ENC_TIME_TIMESPEC|ENC_BIG_ENDIAN); + proto_item_append_text(ti, "; Source: %s", val_to_str_const(source, ixiatrailer_ftype_timestamp, "Unknown")); + break; + + default: + /* Not a recognised time format - just show as bytes */ + ti = proto_tree_add_item(ixiatrailer_tree, hf_ixiatrailer_generic, tvb, offset, time_length, ENC_NA); + proto_item_append_text(ti, " [Id: %u, Length: %u]", source, time_length); + break; + } + + /* We are claiming all of the bytes */ + return tvblen; } void @@ -202,3 +202,16 @@ proto_reg_handoff_ixiatrailer(void) /* Check for Ixia format in the ethernet trailer */ heur_dissector_add("eth.trailer", dissect_ixiatrailer, proto_ixiatrailer); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c index 80d3b3bc35..30e0a3992e 100644 --- a/epan/dissectors/packet-kingfisher.c +++ b/epan/dissectors/packet-kingfisher.c @@ -383,3 +383,16 @@ proto_reg_handoff_kingfisher( void ) kingfisher_conv_handle = new_create_dissector_handle(dissect_kingfisher_conv, proto_kingfisher); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 2a78d40838..5bc9ec5a33 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -999,3 +999,15 @@ void proto_reg_handoff_kink(void) { } +/* + * 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: + */ diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index cb7a22e4ac..bacbc3e6aa 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -288,3 +288,16 @@ void proto_reg_handoff_lanforge(void) /* Find data dissector handle */ data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index dee7675976..0d2f50c56c 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -1170,3 +1170,16 @@ proto_reg_handoff_lwres(void) lwres_port = global_lwres_port; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index a1de187a8a..673f6eee16 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -354,3 +354,16 @@ proto_reg_handoff_mdshdr(void) } } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c index 6d4efefbc0..798e1386a8 100644 --- a/epan/dissectors/packet-media.c +++ b/epan/dissectors/packet-media.c @@ -110,3 +110,16 @@ proto_register_media(void) */ proto_set_cant_toggle(proto_media); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index be96ffa0d2..b499549ad7 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -2565,3 +2565,16 @@ proto_reg_handoff_mpls_echo(void) mpls_echo_udp_port = global_mpls_echo_udp_port; dissector_add_uint("udp.port", global_mpls_echo_udp_port, mpls_echo_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index bbca2788a1..2975a5d356 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -792,3 +792,16 @@ proto_reg_handoff_mrp_msrp(void) msrp_handle = create_dissector_handle(dissect_msrp, proto_msrp); dissector_add_uint("ethertype", ETHERTYPE_MSRP, msrp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 08c036ce01..c1fff15bcd 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -9573,3 +9573,16 @@ proto_reg_handoff_ndps(void) dissector_add_uint("tcp.port", TCP_PORT_NOTIFY_LISTENER, ndps_tcp_handle); ndps_data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 9251f8d7ae..65ccf2be79 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -360,99 +360,99 @@ dissect_netanalyzer_transparent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t void proto_register_netanalyzer(void) { - static hf_register_info hf[] = { - { &hf_netanalyzer_gpio_number, - { "Event on", "netanalyzer.gpio_event.gpio_number", - FT_UINT8, BASE_HEX, VALS(gpio_number), 0x0, - "Event on GPIO number", HFILL } - }, - { &hf_netanalyzer_gpio_edge, - { "Event type", "netanalyzer.gpio_event.gpio_edge", - FT_UINT8, BASE_HEX, VALS(gpio_edge_vals), 0x0, - "Edge of GPIO event", HFILL } - }, - { &hf_netanalyzer_port, - { "Reception Port", "netanalyzer.port", - FT_UINT8, BASE_DEC, NULL, 0x0, - "netANALYZER reception port", HFILL } - }, - { &hf_netanalyzer_length, - { "Ethernet frame length", "netanalyzer.framelen", - FT_UINT16, BASE_DEC, NULL, 0x0, - "Actual Ethernet frame length", HFILL } - }, - { &hf_netanalyzer_status, - { "Status", "netanalyzer.packetstatus", - FT_UINT8, BASE_HEX, NULL, MSK_PACKET_STATUS, - "Status of Ethernet frame", HFILL } - }, - { &hf_netanalyzer_status_rx_err, - { "MII RX_ER error", "netanalyzer.packetstatus.rx_er", - FT_BOOLEAN, 8, NULL, MSK_RX_ERR, - "RX_ER detected in frame", HFILL } - }, - { &hf_netanalyzer_status_align_err, - { "Alignment error", "netanalyzer.packetstatus.alignment_error", - FT_BOOLEAN, 8, NULL, MSK_ALIGN_ERR, - NULL, HFILL } - }, - { &hf_netanalyzer_status_fcs, - { "FCS error", "netanalyzer.packetstatus.fcs_error", - FT_BOOLEAN, 8, NULL, MSK_FCS_ERROR, - NULL, HFILL } - }, - { &hf_netanalyzer_status_too_long, - { "Frame too long", "netanalyzer.packetstatus.too_long", - FT_BOOLEAN, 8, NULL, MSK_TOO_LONG, - "Frame too long (capture truncated)", HFILL } - }, - { &hf_netanalyzer_status_sfd_error, - { "No valid SFD found", "netanalyzer.packetstatus.sfd_error", - FT_BOOLEAN, 8, NULL, MSK_SFD_ERROR, - "SDF error detected in frame", HFILL } - }, - { &hf_netanalyzer_status_short_frame, - { "Frame smaller 64 bytes", "netanalyzer.packetstatus.short_frame", - FT_BOOLEAN, 8, NULL, MSK_SHORT_FRAME, - NULL, HFILL } - }, - { &hf_netanalyzer_status_short_preamble, - { "Preamble shorter than 7 bytes", "netanalyzer.packetstatus.short_preamble", - FT_BOOLEAN, 8, NULL, MSK_SHORT_PREAMBLE, - NULL, HFILL } - }, - { &hf_netanalyzer_status_long_preamble, - { "Preamble longer than 7 bytes", "netanalyzer.packetstatus.long_preamble", - FT_BOOLEAN, 8, NULL, MSK_LONG_PREAMBLE, - NULL, HFILL } - }, - }; - - static gint *ett[] = { - &ett_netanalyzer, - &ett_netanalyzer_status, - &ett_netanalyzer_transparent, - }; - - static ei_register_info ei[] = { - { &ei_netanalyzer_header_version_wrong, { "netanalyzer.header_version.wrong", PI_PROTOCOL, PI_ERROR, "Wrong netANALYZER header version", EXPFILL }}, - { &ei_netanalyzer_gpio_def_none, { "netanalyzer.gpio_def_none", PI_MALFORMED, PI_ERROR, "No valid netANALYZER GPIO definition found", EXPFILL }}, - { &ei_netanalyzer_header_version_none, { "netanalyzer.header_version.none", PI_MALFORMED, PI_ERROR, "No netANALYZER header found", EXPFILL }}, - { &ei_netanalyzer_transparent_frame, { "netanalyzer.transparent_frame", PI_PROTOCOL, PI_NOTE, "This frame was captured in transparent mode", EXPFILL }}, - { &ei_netanalyzer_alignment_error, { "netanalyzer.alignment_error", PI_PROTOCOL, PI_WARN, "Displayed frame data contains additional nibble due to alignment error (upper nibble is not valid)", EXPFILL }}, - }; - - expert_module_t* expert_netanalyzer; - - proto_netanalyzer = proto_register_protocol ( - "netANALYZER", /* name */ - "netANALYZER", /* short name */ - "netanalyzer" ); /* abbrev */ - - proto_register_field_array(proto_netanalyzer, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); - expert_netanalyzer = expert_register_protocol(proto_netanalyzer); - expert_register_field_array(expert_netanalyzer, ei, array_length(ei)); + static hf_register_info hf[] = { + { &hf_netanalyzer_gpio_number, + { "Event on", "netanalyzer.gpio_event.gpio_number", + FT_UINT8, BASE_HEX, VALS(gpio_number), 0x0, + "Event on GPIO number", HFILL } + }, + { &hf_netanalyzer_gpio_edge, + { "Event type", "netanalyzer.gpio_event.gpio_edge", + FT_UINT8, BASE_HEX, VALS(gpio_edge_vals), 0x0, + "Edge of GPIO event", HFILL } + }, + { &hf_netanalyzer_port, + { "Reception Port", "netanalyzer.port", + FT_UINT8, BASE_DEC, NULL, 0x0, + "netANALYZER reception port", HFILL } + }, + { &hf_netanalyzer_length, + { "Ethernet frame length", "netanalyzer.framelen", + FT_UINT16, BASE_DEC, NULL, 0x0, + "Actual Ethernet frame length", HFILL } + }, + { &hf_netanalyzer_status, + { "Status", "netanalyzer.packetstatus", + FT_UINT8, BASE_HEX, NULL, MSK_PACKET_STATUS, + "Status of Ethernet frame", HFILL } + }, + { &hf_netanalyzer_status_rx_err, + { "MII RX_ER error", "netanalyzer.packetstatus.rx_er", + FT_BOOLEAN, 8, NULL, MSK_RX_ERR, + "RX_ER detected in frame", HFILL } + }, + { &hf_netanalyzer_status_align_err, + { "Alignment error", "netanalyzer.packetstatus.alignment_error", + FT_BOOLEAN, 8, NULL, MSK_ALIGN_ERR, + NULL, HFILL } + }, + { &hf_netanalyzer_status_fcs, + { "FCS error", "netanalyzer.packetstatus.fcs_error", + FT_BOOLEAN, 8, NULL, MSK_FCS_ERROR, + NULL, HFILL } + }, + { &hf_netanalyzer_status_too_long, + { "Frame too long", "netanalyzer.packetstatus.too_long", + FT_BOOLEAN, 8, NULL, MSK_TOO_LONG, + "Frame too long (capture truncated)", HFILL } + }, + { &hf_netanalyzer_status_sfd_error, + { "No valid SFD found", "netanalyzer.packetstatus.sfd_error", + FT_BOOLEAN, 8, NULL, MSK_SFD_ERROR, + "SDF error detected in frame", HFILL } + }, + { &hf_netanalyzer_status_short_frame, + { "Frame smaller 64 bytes", "netanalyzer.packetstatus.short_frame", + FT_BOOLEAN, 8, NULL, MSK_SHORT_FRAME, + NULL, HFILL } + }, + { &hf_netanalyzer_status_short_preamble, + { "Preamble shorter than 7 bytes", "netanalyzer.packetstatus.short_preamble", + FT_BOOLEAN, 8, NULL, MSK_SHORT_PREAMBLE, + NULL, HFILL } + }, + { &hf_netanalyzer_status_long_preamble, + { "Preamble longer than 7 bytes", "netanalyzer.packetstatus.long_preamble", + FT_BOOLEAN, 8, NULL, MSK_LONG_PREAMBLE, + NULL, HFILL } + }, + }; + + static gint *ett[] = { + &ett_netanalyzer, + &ett_netanalyzer_status, + &ett_netanalyzer_transparent, + }; + + static ei_register_info ei[] = { + { &ei_netanalyzer_header_version_wrong, { "netanalyzer.header_version.wrong", PI_PROTOCOL, PI_ERROR, "Wrong netANALYZER header version", EXPFILL }}, + { &ei_netanalyzer_gpio_def_none, { "netanalyzer.gpio_def_none", PI_MALFORMED, PI_ERROR, "No valid netANALYZER GPIO definition found", EXPFILL }}, + { &ei_netanalyzer_header_version_none, { "netanalyzer.header_version.none", PI_MALFORMED, PI_ERROR, "No netANALYZER header found", EXPFILL }}, + { &ei_netanalyzer_transparent_frame, { "netanalyzer.transparent_frame", PI_PROTOCOL, PI_NOTE, "This frame was captured in transparent mode", EXPFILL }}, + { &ei_netanalyzer_alignment_error, { "netanalyzer.alignment_error", PI_PROTOCOL, PI_WARN, "Displayed frame data contains additional nibble due to alignment error (upper nibble is not valid)", EXPFILL }}, + }; + + expert_module_t* expert_netanalyzer; + + proto_netanalyzer = proto_register_protocol ( + "netANALYZER", /* name */ + "netANALYZER", /* short name */ + "netanalyzer" ); /* abbrev */ + + proto_register_field_array(proto_netanalyzer, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + expert_netanalyzer = expert_register_protocol(proto_netanalyzer); + expert_register_field_array(expert_netanalyzer, ei, array_length(ei)); } @@ -470,3 +470,16 @@ void proto_reg_handoff_netanalyzer(void) dissector_add_uint("wtap_encap", WTAP_ENCAP_NETANALYZER, netana_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_NETANALYZER_TRANSPARENT, netana_handle_transparent); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 66d240d23e..1bd63740ba 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -1399,3 +1399,16 @@ proto_reg_handoff_nhrp(void) dissector_add_uint("gre.proto", GRE_NHRP, nhrp_handle); dissector_add_uint("llc.iana_pid", IANA_PID_MARS_NHRP_CONTROL, nhrp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c index 90f42e0f3b..5cbed09b3c 100644 --- a/epan/dissectors/packet-noe.c +++ b/epan/dissectors/packet-noe.c @@ -1672,3 +1672,16 @@ void proto_reg_handoff_noe(void) dissector_add_uint("ua.opcode", 0x15, handle_noe); #endif } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c index afae821ff0..9abb99b628 100644 --- a/epan/dissectors/packet-osi.c +++ b/epan/dissectors/packet-osi.c @@ -568,3 +568,15 @@ proto_register_osi(void) } +/* + * 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: + */ diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index 8e9f01c12b..03698720c6 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -881,4 +881,15 @@ proto_reg_handoff_pgsql(void) saved_pgsql_port = pgsql_port; } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 1497465230..8eb454f0c6 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -1567,3 +1567,16 @@ proto_reg_handoff_pim(void) ip_handle = find_dissector("ip"); ipv6_handle = find_dissector("ipv6"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 18e3a6a158..84db9e694a 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -1395,3 +1395,15 @@ void proto_reg_handoff_pnrp(void) dissector_add_uint("udp.port",PNRP_PORT,pnrp_handle); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index dd262a1fe1..6082641213 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -2963,3 +2963,16 @@ prefs_register_rdp(void) { if ((tcp_port > 0) && (tcp_port != 102) && tpkt_handle) dissector_add_uint("tcp.port", tcp_port, tpkt_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: + */ diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 47da5e971c..e67b86661e 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -1502,3 +1502,16 @@ proto_reg_handoff_rtsp(void) stats_tree_register("rtsp","rtsp","RTSP/Packet Counter", 0, rtsp_stats_tree_packet, rtsp_stats_tree_init, NULL ); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 6abcc6c83f..9cb66b9cb0 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -4160,3 +4160,16 @@ proto_reg_handoff_sccp(void) default_handle = find_dissector(default_payload); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index ada7174ce6..c7fae052da 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -401,3 +401,16 @@ proto_reg_handoff_sita(void) dissector_add_uint("sita.proto", SITA_PROTO_ALC, ipars_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_SITA, sita_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index bc793de974..e8b3a7125e 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -584,3 +584,16 @@ proto_reg_handoff_sndcp(void) ip_handle = find_dissector("ip"); data_handle = find_dissector("data"); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 7172413683..d19228bb5a 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -2057,3 +2057,16 @@ proto_reg_handoff_telnet(void) tn3270_handle = find_dissector("tn3270"); tn5250_handle = find_dissector("tn5250"); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index 14b3e01cd8..f7b7b5fe8f 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -7492,3 +7492,16 @@ proto_register_tn5250(void) expert_register_field_array(expert_tn5250, ei, array_length(ei)); } + +/* + * 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: + */ diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index 985ef178c4..741d7c4434 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -206,3 +206,15 @@ proto_reg_handoff_trill(void) eth_dissector = find_dissector( "eth" ) ; } +/* + * 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: + */ diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c index 26c7fed8dd..a85db6f1a5 100644 --- a/epan/dissectors/packet-ua.c +++ b/epan/dissectors/packet-ua.c @@ -314,3 +314,16 @@ void proto_reg_handoff_ua_msg(void) data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c index 74d7dd715d..b2bae91d48 100644 --- a/epan/dissectors/packet-vicp.c +++ b/epan/dissectors/packet-vicp.c @@ -117,3 +117,16 @@ void proto_reg_handoff_vicp(void) vicp_handle = create_dissector_handle(dissect_vicp, proto_vicp); dissector_add_uint("tcp.port", VICP_PORT, vicp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 3 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=3 tabstop=8 expandtab: + * :indentSize=3:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-aps.h b/epan/dissectors/packet-zbee-aps.h index 7ea87970ae..48991f9765 100644 --- a/epan/dissectors/packet-zbee-aps.h +++ b/epan/dissectors/packet-zbee-aps.h @@ -272,4 +272,17 @@ typedef struct{ extern const value_string zbee_aps_cid_names[]; +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ + #endif /* PACKET_ZBEE_APS_H*/ diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 1664d442c4..5d973a6056 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -2060,3 +2060,16 @@ proto_init_zbee_nwk(void) zbee_nwk_map.long_table = g_hash_table_new(ieee802154_long_addr_hash, ieee802154_long_addr_equal); zbee_table_nwk_keyring = g_hash_table_new_full(g_int_hash, g_int_equal, NULL, free_keyring_val); } /* proto_init_zbee_nwk */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-nwk.h b/epan/dissectors/packet-zbee-nwk.h index 5210971a15..18838057e3 100644 --- a/epan/dissectors/packet-zbee-nwk.h +++ b/epan/dissectors/packet-zbee-nwk.h @@ -203,4 +203,18 @@ extern GHashTable *zbee_table_link_keyring; #define ZBEE_IP_BEACON_TLV_TYPE_MASK 0xf0 #define ZBEE_IP_BEACON_TLV_TYPE_LFDI 0x0 +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ + #endif /* PACKET_ZBEE_NWK_H */ + diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index f69ee3e18a..438c20dd7e 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -1268,3 +1268,16 @@ proto_init_zbee_security(void) zbee_pc_keyring = g_slist_prepend(zbee_pc_keyring, g_memdup(&key_record, sizeof(key_record_t))); } /* for */ } /* proto_init_zbee_security */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-security.h b/epan/dissectors/packet-zbee-security.h index 482cac434e..61457b87c9 100644 --- a/epan/dissectors/packet-zbee-security.h +++ b/epan/dissectors/packet-zbee-security.h @@ -80,4 +80,17 @@ extern void zbee_security_handoff (void); extern tvbuff_t *dissect_zbee_secure(tvbuff_t *, packet_info *, proto_tree *, guint); extern gboolean zbee_sec_ccm_decrypt(const gchar *, const gchar *, const gchar *, const gchar *, gchar *, guint, guint, guint); +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ + #endif /* PACKET_ZBEE_SECURITY_H */ diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c index 4bad7b6493..d22817c4b9 100644 --- a/epan/dissectors/packet-zbee-zcl-ha.c +++ b/epan/dissectors/packet-zbee-zcl-ha.c @@ -1577,3 +1577,16 @@ proto_reg_handoff_zbee_zcl_appl_stats(void) (zbee_zcl_fn_cmd_id)dissect_zcl_appl_stats_cmd_id ); } /*proto_reg_handoff_zbee_zcl_appl_stats*/ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c index aedb135fe6..48d0b92b20 100644 --- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c +++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c @@ -1456,3 +1456,16 @@ proto_reg_handoff_zbee_zcl_relhum_meas(void) NULL ); } /*proto_reg_handoff_zbee_zcl_relhum_meas*/ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index c44c153af3..43365fde19 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -548,3 +548,15 @@ proto_reg_handoff_zbee_zcl_msg(void) ); } /*proto_reg_handoff_zbee_zcl_msg*/ +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index 7f63862159..0cf9936291 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -3047,3 +3047,16 @@ zbee_zcl_cluster_desc return NULL; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-zdp-binding.c b/epan/dissectors/packet-zbee-zdp-binding.c index 391205723a..d059f933c6 100644 --- a/epan/dissectors/packet-zbee-zdp-binding.c +++ b/epan/dissectors/packet-zbee-zdp-binding.c @@ -973,3 +973,16 @@ dissect_zbee_zdp_rsp_recover_source_bind(tvbuff_t *tvb, packet_info *pinfo, prot /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); } /* dissect_zbee_zdp_rsp_recover_source_bind */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-zdp-discovery.c b/epan/dissectors/packet-zbee-zdp-discovery.c index 4544da17d5..95b6b6901a 100644 --- a/epan/dissectors/packet-zbee-zdp-discovery.c +++ b/epan/dissectors/packet-zbee-zdp-discovery.c @@ -1548,3 +1548,16 @@ dissect_zbee_zdp_rsp_ext_active_ep(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); } /* dissect_zbee_zdp_rsp_ext_active_ep */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c index d80449a380..74a75b75a4 100644 --- a/epan/dissectors/packet-zbee-zdp-management.c +++ b/epan/dissectors/packet-zbee-zdp-management.c @@ -931,3 +931,16 @@ dissect_zbee_zdp_rsp_mgmt_nwkupdate(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); } /* dissect_zbee_zdp_rsp_mgmt_nwkupdate */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 85fa347623..a86b46cfa5 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -1745,3 +1745,16 @@ void proto_reg_handoff_zbee_zdp(void) zdp_handle = find_dissector("zbee_zdp"); dissector_add_uint("zbee.profile", ZBEE_ZDP_PROFILE, zdp_handle); } /* proto_reg_handoff_zbee_zdp */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zbee-zdp.h b/epan/dissectors/packet-zbee-zdp.h index 8364130c8e..691882f154 100644 --- a/epan/dissectors/packet-zbee-zdp.h +++ b/epan/dissectors/packet-zbee-zdp.h @@ -388,4 +388,17 @@ extern void zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *o extern const value_string zbee_zdp_cluster_names[]; extern const value_string zbee_zdp_rtg_status_vals[]; +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ + #endif /* PACKET_ZBEE_ZDP_H */ diff --git a/epan/dissectors/packet-zbee.h b/epan/dissectors/packet-zbee.h index 376c66a9dc..80ac7a74d5 100644 --- a/epan/dissectors/packet-zbee.h +++ b/epan/dissectors/packet-zbee.h @@ -806,4 +806,17 @@ /* Helper Functions */ extern guint zbee_get_bit_field(guint input, guint mask); +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ + #endif /* PACKET_ZBEE_H */ diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index 7c2c793722..bf6b036223 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -358,3 +358,15 @@ void proto_reg_handoff_zep(void) lastPort = gPREF_zep_udp_port; } /* proto_reg_handoff_zep */ +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index cfd94bf9ce..51e052cc7f 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -1173,3 +1173,16 @@ proto_reg_handoff_zrtp(void) zrtp_handle = find_dissector("zrtp"); dissector_add_for_decode_as("udp.port", zrtp_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: + */ diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index 3d97e7fd84..d4e76d91a5 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -17765,3 +17765,15 @@ static const value_string usb_products_vals[] = { }; value_string_ext ext_usb_products_vals = VALUE_STRING_EXT_INIT(usb_products_vals); +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ |