aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-09-18 21:56:44 -0400
committerBill Meier <wmeier@newsguy.com>2014-09-19 02:01:58 +0000
commitcd7a11c0d1323a3e7e0bccb476397f8569db41b5 (patch)
tree49c44f6f13f3de0340f3df3d70e57d1d1c49b94e
parent18d72987cb44eb3594b054a8509c447dbc709b46 (diff)
Add editor modelines; Adjust indentation as needed.
Change-Id: Ie8d4056ab706bbc85c8247682b1a64ea98bc89f2 Reviewed-on: https://code.wireshark.org/review/4185 Reviewed-by: Bill Meier <wmeier@newsguy.com>
-rw-r--r--epan/dissectors/packet-batadv.c17
-rw-r--r--epan/dissectors/packet-dis.c12
-rw-r--r--epan/dissectors/packet-foundry.c15
-rw-r--r--epan/dissectors/packet-glusterfs_hndsk.c12
-rw-r--r--epan/dissectors/packet-h264.c13
-rw-r--r--epan/dissectors/packet-maccontrol.c25
-rw-r--r--epan/dissectors/packet-mrp-mmrp.c13
-rw-r--r--epan/dissectors/packet-zebra.c315
8 files changed, 261 insertions, 161 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index fbed8cc07a..4cd32d5d89 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -3158,8 +3158,8 @@ static void dissect_batadv_roam_adv_v14(tvbuff_t *tvb, packet_info *pinfo, proto
static void batadv_init_routine(void)
{
- reassembly_table_init(&msg_reassembly_table,
- &addresses_reassembly_table_functions);
+ reassembly_table_init(&msg_reassembly_table,
+ &addresses_reassembly_table_functions);
}
void proto_register_batadv(void)
@@ -3711,3 +3711,16 @@ void proto_reg_handoff_batadv(void)
old_batadv_ethertype = batadv_ethertype;
dissector_add_uint("ethertype", batadv_ethertype, batman_handle);
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c
index 52f1142346..0adce591b8 100644
--- a/epan/dissectors/packet-dis.c
+++ b/epan/dissectors/packet-dis.c
@@ -7885,3 +7885,15 @@ void proto_reg_handoff_dis(void)
saved_dis_udp_port = dis_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-foundry.c b/epan/dissectors/packet-foundry.c
index c9b9feb9ea..b749ab3d89 100644
--- a/epan/dissectors/packet-foundry.c
+++ b/epan/dissectors/packet-foundry.c
@@ -428,7 +428,7 @@ proto_register_fdp(void)
{ "Unknown", "fdp.tag.unknown", FT_BYTES, BASE_NONE, NULL,
0x0, NULL, HFILL }},
- };
+ };
static gint *ett[] = {
&ett_fdp,
&ett_fdp_tlv_header,
@@ -474,3 +474,16 @@ proto_register_foundry_oui(void)
llc_add_oui(OUI_FOUNDRY, "llc.foundry_pid", "LLC Foundry OUI PID", hf);
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c
index 0d53f313a6..f65f34d6e2 100644
--- a/epan/dissectors/packet-glusterfs_hndsk.c
+++ b/epan/dissectors/packet-glusterfs_hndsk.c
@@ -332,3 +332,15 @@ proto_reg_handoff_gluster_cbk(void)
hf_gluster_cbk_proc);
}
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index 2d7a7c05cc..6b6b52d00b 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -3729,4 +3729,15 @@ proto_reg_handoff_h264(void)
range_foreach(dynamic_payload_type_range, range_add_h264_rtp_pt_callback);
}
-
+/*
+ * 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-maccontrol.c b/epan/dissectors/packet-maccontrol.c
index bc529b4cf4..ca0bbd4251 100644
--- a/epan/dissectors/packet-maccontrol.c
+++ b/epan/dissectors/packet-maccontrol.c
@@ -110,12 +110,12 @@ static const int *macctrl_cbfc_pause_times_list[] = {
#define MACCTRL_CLASS_BASED_FLOW_CNTRL_PAUSE 0x0101
static const value_string opcode_vals[] = {
- { MACCTRL_PAUSE, "MPCP Pause" },
- { MACCTRL_GATE, "MPCP Gate" },
- { MACCTRL_REPORT, "MPCP Report" },
- { MACCTRL_REGISTER_REQ, "MPCP Register Req" },
- { MACCTRL_REGISTER, "MPCP Register" },
- { MACCTRL_REGISTER_ACK, "MPCP Register Ack" },
+ { MACCTRL_PAUSE, "MPCP Pause" },
+ { MACCTRL_GATE, "MPCP Gate" },
+ { MACCTRL_REPORT, "MPCP Report" },
+ { MACCTRL_REGISTER_REQ, "MPCP Register Req" },
+ { MACCTRL_REGISTER, "MPCP Register" },
+ { MACCTRL_REGISTER_ACK, "MPCP Register Ack" },
{ MACCTRL_CLASS_BASED_FLOW_CNTRL_PAUSE, "Class Based Flow Control [CBFC] Pause" },
{ 0, NULL }
};
@@ -381,3 +381,16 @@ proto_reg_handoff_macctrl(void)
macctrl_handle = create_dissector_handle(dissect_macctrl, proto_macctrl);
dissector_add_uint("ethertype", ETHERTYPE_MAC_CONTROL, macctrl_handle);
}
+
+/*
+ * Editor modelines
+ *
+ * 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-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c
index b2165eaff1..98ea0f250b 100644
--- a/epan/dissectors/packet-mrp-mmrp.c
+++ b/epan/dissectors/packet-mrp-mmrp.c
@@ -429,3 +429,16 @@ proto_reg_handoff_mrp_mmrp(void)
mmrp_handle = create_dissector_handle(dissect_mmrp, proto_mmrp);
dissector_add_uint("ethertype", ETHERTYPE_MMRP, mmrp_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-zebra.c b/epan/dissectors/packet-zebra.c
index 5c34f26ec5..6aed9f48a4 100644
--- a/epan/dissectors/packet-zebra.c
+++ b/epan/dissectors/packet-zebra.c
@@ -603,161 +603,174 @@ void
proto_register_zebra(void)
{
- static hf_register_info hf[] = {
- { &hf_zebra_len,
- { "Length", "zebra.len",
- FT_UINT16, BASE_DEC, NULL, 0x0,
- "Length of ZEBRA request", HFILL }},
- { &hf_zebra_version,
- { "Version", "zebra.version",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- "Zerbra srv version", HFILL }},
- { &hf_zebra_request,
- { "Request", "zebra.request",
- FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "TRUE if ZEBRA request", HFILL }},
- { &hf_zebra_command,
- { "Command", "zebra.command",
- FT_UINT8, BASE_DEC, VALS(messages), 0x0,
- "ZEBRA command", HFILL }},
- { &hf_zebra_interface,
- { "Interface", "zebra.interface",
- FT_STRING, BASE_NONE, NULL, 0x0,
- "Interface name of ZEBRA request", HFILL }},
- { &hf_zebra_index,
- { "Index", "zebra.index",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- "Index of interface", HFILL }},
- { &hf_zebra_intstatus,
- { "Status", "zebra.intstatus",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- "Status of interface", HFILL}},
- { &hf_zebra_indexnum,
- { "Index Number", "zebra.indexnum",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- "Number of indices for route", HFILL }},
- { &hf_zebra_intflags,
- { "Flags", "zebra.intflags",
- FT_UINT64, BASE_DEC, NULL, 0x0,
- "Flags of interface", HFILL }},
- { &hf_zebra_rtflags,
- { "Flags", "zebra.rtflags",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- "Flags of route", HFILL }},
- { &hf_zebra_message,
- { "Message", "zebra.message",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- "Message type of route", HFILL }},
- { &hf_zebra_msg_nexthop,
- { "Message Nexthop", "zebra.message.nexthop",
- FT_BOOLEAN, 8, NULL, ZEBRA_ZAPI_MESSAGE_NEXTHOP,
- "Message contains nexthop", HFILL }},
- { &hf_zebra_msg_index,
- { "Message Index", "zebra.message.index",
- FT_BOOLEAN, 8, NULL, ZEBRA_ZAPI_MESSAGE_IFINDEX,
- "Message contains index", HFILL }},
- { &hf_zebra_msg_distance,
- { "Message Distance", "zebra.message.distance",
- FT_BOOLEAN, 8, NULL, ZEBRA_ZAPI_MESSAGE_DISTANCE,
- "Message contains distance", HFILL }},
- { &hf_zebra_msg_metric,
- { "Message Metric", "zebra.message.metric",
- FT_BOOLEAN, 8, NULL, ZEBRA_ZAPI_MESSAGE_METRIC,
- "Message contains metric", HFILL }},
- { &hf_zebra_type,
- { "Type", "zebra.type",
- FT_UINT8, BASE_DEC, VALS(routes), 0x0,
- "Type of route", HFILL }},
- { &hf_zebra_distance,
- { "Distance", "zebra.distance",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- "Distance of route", HFILL }},
- { &hf_zebra_metric,
- { "Metric", "zebra.metric",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- "Metric of interface or route", HFILL }},
- { &hf_zebra_mtu,
- { "MTU", "zebra.mtu",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- "MTU of interface", HFILL }},
- { &hf_zebra_mtu6,
- { "MTUv6", "zebra.mtu6",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- "MTUv6 of interface", HFILL }},
- { &hf_zebra_bandwidth,
- { "Bandwidth", "zebra.bandwidth",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- "Bandwidth of interface", HFILL }},
- { &hf_zebra_family,
- { "Family", "zebra.family",
- FT_UINT8, BASE_DEC, VALS(families), 0x0,
- "Family of IP address", HFILL }},
- { &hf_zebra_flags,
- { "Flags", "zebra.flags",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- "Flags of Address Info", HFILL }},
- { &hf_zebra_dest4,
- { "Destination", "zebra.dest4",
- FT_IPv4, BASE_NONE, NULL, 0x0,
- "Destination IPv4 field", HFILL }},
- { &hf_zebra_dest6,
- { "Destination", "zebra.dest6",
- FT_IPv6, BASE_NONE, NULL, 0x0,
- "Destination IPv6 field", HFILL }},
- { &hf_zebra_nexthopnum,
- { "Nexthop Number", "zebra.nexthopnum",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- "Number of nexthops in route", HFILL }},
- { &hf_zebra_nexthop4,
- { "Nexthop", "zebra.nexthop4",
- FT_IPv4, BASE_NONE, NULL, 0x0,
- "Nethop IPv4 field of route", HFILL }},
- { &hf_zebra_nexthop6,
- { "Nexthop", "zebra.nexthop6",
- FT_IPv6, BASE_NONE, NULL, 0x0,
- "Nethop IPv6 field of route", HFILL }},
- { &hf_zebra_prefixlen,
- { "Prefix length", "zebra.prefixlen",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- NULL, HFILL }},
- { &hf_zebra_prefix4,
- { "Prefix", "zebra.prefix4",
- FT_IPv4, BASE_NONE, NULL, 0x0,
- "Prefix IPv4", HFILL }},
- { &hf_zebra_prefix6,
- { "Prefix", "zebra.prefix6",
- FT_IPv6, BASE_NONE, NULL, 0x0,
- "Prefix IPv6", HFILL }},
- { &hf_zebra_routeridaddress,
- { "Router ID address", "zebra.routerIDAddress",
- FT_IPv4, BASE_NONE, NULL, 0x0,
- "Router ID", HFILL }},
- { &hf_zebra_routeridmask,
- { "Router ID mask", "zebra.routerIDMask",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- "netmask of Router ID", HFILL }},
- { &hf_zebra_mac,
- { "MAC address", "zebra.macaddress",
- FT_ETHER, BASE_NONE, NULL, 0x0,
- "MAC address of interface", HFILL }},
- };
-
- static gint *ett[] = {
- &ett_zebra,
- &ett_zebra_request,
- &ett_message,
- };
-
- proto_zebra = proto_register_protocol("Zebra Protocol", "ZEBRA", "zebra");
- proto_register_field_array(proto_zebra, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
+ static hf_register_info hf[] = {
+ { &hf_zebra_len,
+ { "Length", "zebra.len",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "Length of ZEBRA request", HFILL }},
+ { &hf_zebra_version,
+ { "Version", "zebra.version",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Zerbra srv version", HFILL }},
+ { &hf_zebra_request,
+ { "Request", "zebra.request",
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ "TRUE if ZEBRA request", HFILL }},
+ { &hf_zebra_command,
+ { "Command", "zebra.command",
+ FT_UINT8, BASE_DEC, VALS(messages), 0x0,
+ "ZEBRA command", HFILL }},
+ { &hf_zebra_interface,
+ { "Interface", "zebra.interface",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ "Interface name of ZEBRA request", HFILL }},
+ { &hf_zebra_index,
+ { "Index", "zebra.index",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ "Index of interface", HFILL }},
+ { &hf_zebra_intstatus,
+ { "Status", "zebra.intstatus",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Status of interface", HFILL}},
+ { &hf_zebra_indexnum,
+ { "Index Number", "zebra.indexnum",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Number of indices for route", HFILL }},
+ { &hf_zebra_intflags,
+ { "Flags", "zebra.intflags",
+ FT_UINT64, BASE_DEC, NULL, 0x0,
+ "Flags of interface", HFILL }},
+ { &hf_zebra_rtflags,
+ { "Flags", "zebra.rtflags",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Flags of route", HFILL }},
+ { &hf_zebra_message,
+ { "Message", "zebra.message",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Message type of route", HFILL }},
+ { &hf_zebra_msg_nexthop,
+ { "Message Nexthop", "zebra.message.nexthop",
+ FT_BOOLEAN, 8, NULL, ZEBRA_ZAPI_MESSAGE_NEXTHOP,
+ "Message contains nexthop", HFILL }},
+ { &hf_zebra_msg_index,
+ { "Message Index", "zebra.message.index",
+ FT_BOOLEAN, 8, NULL, ZEBRA_ZAPI_MESSAGE_IFINDEX,
+ "Message contains index", HFILL }},
+ { &hf_zebra_msg_distance,
+ { "Message Distance", "zebra.message.distance",
+ FT_BOOLEAN, 8, NULL, ZEBRA_ZAPI_MESSAGE_DISTANCE,
+ "Message contains distance", HFILL }},
+ { &hf_zebra_msg_metric,
+ { "Message Metric", "zebra.message.metric",
+ FT_BOOLEAN, 8, NULL, ZEBRA_ZAPI_MESSAGE_METRIC,
+ "Message contains metric", HFILL }},
+ { &hf_zebra_type,
+ { "Type", "zebra.type",
+ FT_UINT8, BASE_DEC, VALS(routes), 0x0,
+ "Type of route", HFILL }},
+ { &hf_zebra_distance,
+ { "Distance", "zebra.distance",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Distance of route", HFILL }},
+ { &hf_zebra_metric,
+ { "Metric", "zebra.metric",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ "Metric of interface or route", HFILL }},
+ { &hf_zebra_mtu,
+ { "MTU", "zebra.mtu",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ "MTU of interface", HFILL }},
+ { &hf_zebra_mtu6,
+ { "MTUv6", "zebra.mtu6",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ "MTUv6 of interface", HFILL }},
+ { &hf_zebra_bandwidth,
+ { "Bandwidth", "zebra.bandwidth",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ "Bandwidth of interface", HFILL }},
+ { &hf_zebra_family,
+ { "Family", "zebra.family",
+ FT_UINT8, BASE_DEC, VALS(families), 0x0,
+ "Family of IP address", HFILL }},
+ { &hf_zebra_flags,
+ { "Flags", "zebra.flags",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Flags of Address Info", HFILL }},
+ { &hf_zebra_dest4,
+ { "Destination", "zebra.dest4",
+ FT_IPv4, BASE_NONE, NULL, 0x0,
+ "Destination IPv4 field", HFILL }},
+ { &hf_zebra_dest6,
+ { "Destination", "zebra.dest6",
+ FT_IPv6, BASE_NONE, NULL, 0x0,
+ "Destination IPv6 field", HFILL }},
+ { &hf_zebra_nexthopnum,
+ { "Nexthop Number", "zebra.nexthopnum",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Number of nexthops in route", HFILL }},
+ { &hf_zebra_nexthop4,
+ { "Nexthop", "zebra.nexthop4",
+ FT_IPv4, BASE_NONE, NULL, 0x0,
+ "Nethop IPv4 field of route", HFILL }},
+ { &hf_zebra_nexthop6,
+ { "Nexthop", "zebra.nexthop6",
+ FT_IPv6, BASE_NONE, NULL, 0x0,
+ "Nethop IPv6 field of route", HFILL }},
+ { &hf_zebra_prefixlen,
+ { "Prefix length", "zebra.prefixlen",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+ { &hf_zebra_prefix4,
+ { "Prefix", "zebra.prefix4",
+ FT_IPv4, BASE_NONE, NULL, 0x0,
+ "Prefix IPv4", HFILL }},
+ { &hf_zebra_prefix6,
+ { "Prefix", "zebra.prefix6",
+ FT_IPv6, BASE_NONE, NULL, 0x0,
+ "Prefix IPv6", HFILL }},
+ { &hf_zebra_routeridaddress,
+ { "Router ID address", "zebra.routerIDAddress",
+ FT_IPv4, BASE_NONE, NULL, 0x0,
+ "Router ID", HFILL }},
+ { &hf_zebra_routeridmask,
+ { "Router ID mask", "zebra.routerIDMask",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "netmask of Router ID", HFILL }},
+ { &hf_zebra_mac,
+ { "MAC address", "zebra.macaddress",
+ FT_ETHER, BASE_NONE, NULL, 0x0,
+ "MAC address of interface", HFILL }},
+ };
+
+ static gint *ett[] = {
+ &ett_zebra,
+ &ett_zebra_request,
+ &ett_message,
+ };
+
+ proto_zebra = proto_register_protocol("Zebra Protocol", "ZEBRA", "zebra");
+ proto_register_field_array(proto_zebra, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_zebra(void)
{
- dissector_handle_t zebra_handle;
+ dissector_handle_t zebra_handle;
- zebra_handle = create_dissector_handle(dissect_zebra, proto_zebra);
- dissector_add_uint("tcp.port", TCP_PORT_ZEBRA, zebra_handle);
+ zebra_handle = create_dissector_handle(dissect_zebra, proto_zebra);
+ dissector_add_uint("tcp.port", TCP_PORT_ZEBRA, zebra_handle);
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */