diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-15 14:46:30 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-15 22:47:03 +0000 |
| commit | fea325d2ba86cee47bb6bf89a068906744701c88 (patch) | |
| tree | 403c99ed077e31fee09090b2ce689e8ed8aac0b7 /wiretap/wtap.c | |
| parent | 1917023fc157b896a23349c0eca8c95f22f2fb6f (diff) | |
| download | wireshark-fea325d2ba86cee47bb6bf89a068906744701c88.tar.gz | |
Handle DLT_LOOP differently from DLT_NULL.
That's a little cleaner, and lets us preserve the LINKTYPE_ value for
DLT_LOOP captures. ("Preserve" here doesn't mean "write files with a
link-layer header type of 12", as that's ambiguous; we write it with a
link-layer header type of LINKTYPE_LOOP, i.e. 108. If programs on
OpenBSD don't recognize that as DLT_LOOP, that's a bug in OpenBSD's
libpcap or in the program.)
Change-Id: I48a2e04aed41c013823ffb5c588d2a8e8b376e15
Reviewed-on: https://code.wireshark.org/review/7143
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 6dc8a5c150..6b0cf92610 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -259,7 +259,7 @@ static struct encap_type_info encap_table_base[] = { { "ATM PDUs - untruncated", "atm-pdus-untruncated" }, /* WTAP_ENCAP_NULL */ - { "NULL", "null" }, + { "NULL/Loopback", "null" }, /* WTAP_ENCAP_ASCEND */ { "Lucent/Ascend access equipment", "ascend" }, @@ -737,6 +737,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_IPMI_TRACE */ { "IPMI Trace Data Collection", "ipmi-trace" }, + + /* WTAP_ENCAP_LOOP */ + { "OpenBSD loopback", "loop" }, }; WS_DLL_LOCAL |