aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-cisco-erspan.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-09-30 16:59:17 -0400
committerBill Meier <wmeier@newsguy.com>2014-09-30 21:06:37 +0000
commit9b181b97c62542625a5ea6573e68c85202dd1f38 (patch)
treec210a0e51e6165a98bbe3eee64cf2e9a566cde49 /epan/dissectors/packet-cisco-erspan.c
parent6896c2648cbdd13a1a00d429ee43be6a2680f094 (diff)
Add editor modelines; Adjust whitespace; Remove boilerplate comments
Change-Id: I1f5f83ed441f6009125cf2cbe5023af04986898a Reviewed-on: https://code.wireshark.org/review/4392 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-cisco-erspan.c')
-rw-r--r--epan/dissectors/packet-cisco-erspan.c26
1 files changed, 19 insertions, 7 deletions
diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c
index 9142ed3f05..cee85e757b 100644
--- a/epan/dissectors/packet-cisco-erspan.c
+++ b/epan/dissectors/packet-cisco-erspan.c
@@ -131,8 +131,8 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint32 offset = 0;
guint16 version;
- col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME);
- col_set_str(pinfo->cinfo, COL_INFO, PROTO_SHORT_NAME ":");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME);
+ col_set_str(pinfo->cinfo, COL_INFO, PROTO_SHORT_NAME ":");
if (tree) {
@@ -206,8 +206,8 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 12;
}
- eth_tvb = tvb_new_subset_remaining(tvb, offset);
- call_dissector(ethnofcs_handle, eth_tvb, pinfo, tree);
+ eth_tvb = tvb_new_subset_remaining(tvb, offset);
+ call_dissector(ethnofcs_handle, eth_tvb, pinfo, tree);
}
void
@@ -305,11 +305,23 @@ proto_reg_handoff_erspan(void)
{
dissector_handle_t erspan_handle;
- ethnofcs_handle = find_dissector("eth_withoutfcs");
+ ethnofcs_handle = find_dissector("eth_withoutfcs");
erspan_handle = create_dissector_handle(dissect_erspan, proto_erspan);
- dissector_add_uint("gre.proto", GRE_ERSPAN_88BE, erspan_handle);
- dissector_add_uint("gre.proto", GRE_ERSPAN_22EB, erspan_handle);
+ dissector_add_uint("gre.proto", GRE_ERSPAN_88BE, erspan_handle);
+ dissector_add_uint("gre.proto", GRE_ERSPAN_22EB, erspan_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:
+ */