diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-09-16 17:26:49 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-09-16 17:26:49 +0000 |
| commit | d7b7757a1cd7f8d1dc69a0880279571f8f00f7e1 (patch) | |
| tree | 8e10c60e7cfcc2e65f98b1bb1032eaff2d07e132 /epan | |
| parent | 704eb29ad4c3fc045c4a0960e66286dcc7509420 (diff) | |
Complete process of moving packet-interlink to a built-in dissector:
- Add packet-interlink.c to Makefile.common
(Not included in SVN #37610-37612);
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005
- Also: update signature for dissect_interlink_heur() (as per recent changes).
svn path=/trunk/; revision=44927
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-interlink.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index d9382d888e..517247c8c7 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -668,6 +668,7 @@ DISSECTOR_SRC = \ packet-imf.c \ packet-infiniband.c \ packet-infiniband_sdp.c \ + packet-interlink.c \ packet-ip.c \ packet-ipars.c \ packet-ipdc.c \ diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c index 1f7132e4f8..6e3471c4cf 100644 --- a/epan/dissectors/packet-interlink.c +++ b/epan/dissectors/packet-interlink.c @@ -168,7 +168,7 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static gboolean -dissect_interlink_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_interlink_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { if (!tvb_bytes_exist(tvb, 0, 4)) { return FALSE; |