aboutsummaryrefslogtreecommitdiffstats
path: root/capture_info.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-04-02 23:54:28 -0700
committerGuy Harris <guy@alum.mit.edu>2014-04-03 06:55:18 +0000
commita5a692c4ec67b0ab087b18d147451da2ca4d1db9 (patch)
tree4eda957ba142b0645c9408cdfd09f416a43096a9 /capture_info.c
parent618c27b5e637c06d55a099696f80d53c3edbd827 (diff)
Handle DLT_USER2 as PKTAP, to handle Mavericks.
Change-Id: Ic58c3584994f822d5d5a1434050aaa61f86ba17c Reviewed-on: https://code.wireshark.org/review/937 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'capture_info.c')
-rw-r--r--capture_info.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/capture_info.c b/capture_info.c
index e928691fd8..3ef12df504 100644
--- a/capture_info.c
+++ b/capture_info.c
@@ -363,6 +363,11 @@ capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd,
pseudo-header to DLT_ATM_RFC1483, with LLC header following;
we might have to implement that at some point. */
case WTAP_ENCAP_PKTAP:
+ case WTAP_ENCAP_USER2:
+ /* XXX - WTAP_ENCAP_USER2 to handle Mavericks' botch wherein it
+ uses DLT_USER2 for PKTAP; if you are using DLT_USER2 for your
+ own purposes, feel free to call your own capture_ routine for
+ WTAP_ENCAP_USER2. */
capture_pktap(pd, caplen, counts);
break;
}