diff options
| author | Sake Blok <sake@euronet.nl> | 2007-12-16 00:35:34 +0000 |
|---|---|---|
| committer | Sake Blok <sake@euronet.nl> | 2007-12-16 00:35:34 +0000 |
| commit | 4f05930abe42f432c467c6c9162bc6f57ebf0960 (patch) | |
| tree | d8fefa1faa3421049a7179dac2ce36f13e8644ae /epan/dissectors/packet-ethertype.c | |
| parent | 9a2d18d3869d494dfb4e2438aafa9bf502b459cb (diff) | |
Big 2104 - From Benn Bollay:
This patch adds a heuristic dissector to the ethernet trailer under the
keystring "eth.trailer". This allows for other protocol plugins which coopt
the ethernet trailer for their own devices to register for trailer traffic
without requiring any further changes to the executable.
svn path=/trunk/; revision=23880
Diffstat (limited to 'epan/dissectors/packet-ethertype.c')
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 203fe6918e..a524983b9a 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -142,9 +142,9 @@ const value_string etype_vals[] = { {ETHERTYPE_PTP, "PTPv2 over Ethernet (IEEE1588)"}, {0, NULL } }; -static void add_dix_trailer(proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb, - tvbuff_t *next_tvb, int offset_after_etype, guint length_before, - gint fcs_len); +static void add_dix_trailer(packet_info *pinfo, proto_tree *fh_tree, + int trailer_id, tvbuff_t *tvb, tvbuff_t *next_tvb, int offset_after_etype, + guint length_before, gint fcs_len); void capture_ethertype(guint16 etype, const guchar *pd, int offset, int len, @@ -268,14 +268,14 @@ ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype, } } - add_dix_trailer(fh_tree, trailer_id, tvb, next_tvb, offset_after_etype, + add_dix_trailer(pinfo, fh_tree, trailer_id, tvb, next_tvb, offset_after_etype, length_before, fcs_len); } static void -add_dix_trailer(proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb, - tvbuff_t *next_tvb, int offset_after_etype, guint length_before, - gint fcs_len) +add_dix_trailer(packet_info *pinfo, proto_tree *fh_tree, int trailer_id, + tvbuff_t *tvb, tvbuff_t *next_tvb, int offset_after_etype, + guint length_before, gint fcs_len) { guint length; tvbuff_t *trailer_tvb; @@ -311,7 +311,7 @@ add_dix_trailer(proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb, } else trailer_tvb = NULL; /* no trailer */ - add_ethernet_trailer(fh_tree, trailer_id, tvb, trailer_tvb, fcs_len); + add_ethernet_trailer(pinfo, fh_tree, trailer_id, tvb, trailer_tvb, fcs_len); } void |