Commit Graph

185 Commits

Author SHA1 Message Date
Harald Welte d508a9bf4c Add Ericsson A-bis P-GSL dissector
Ericsson uses a vendor-specific packetized PCU-CCU interface on their
packetized A-bis, which can be encapsulated in their own variant of HDLC
on top of L2TP.

The new P-GSL dissector is called from packet-ehdlc.c, which in turn
integrates with packet-l2tp.c.

Change-Id: Ifca190577b1c9691209221d79e3ef034dc3ca650
Reviewed-on: https://code.wireshark.org/review/16510
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-24 16:39:36 +00:00
Harald Welte e878525f5f Add basic dissector for Ericsson Packet A-bis TFP Protocol
This dissector currently onl dissects the TFP header, treating the
payload (TRAU) as opaque data.  Still, it is an improvement to see the
header information like timeslot, sequence number, delay and frame type.

The new TFP dissector is called from packet-ehdlc.c, which in turn is
used inside Ericsson-specific L2TP.

Change-Id: I8835c07e259ec9a324ec92aac39abbef2c902af3
Reviewed-on: https://code.wireshark.org/review/16509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-24 14:29:09 +00:00
AndersBroman 7844a118cf Add Nordic semiconductors dissector to read files produced by their BTLE
sniffer.
Code downloaded from
https://www.nordicsemi.com/eng/Products/Bluetooth-low-energy/nRF-Sniffer
and cleaned up and modified to comple with current Wireshark version.

Bug 12637
Change-Id: Ic73122f35039b4245d6219b825a28c10f22f36ad
Reviewed-on: https://code.wireshark.org/review/16569
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-22 06:57:54 +00:00
João Valverde cfaf756669 Move Shim6 dissector to packet-shim6.c
Change-Id: Ia0bfbf48e8a4eb23d62c8c5cdccad350caedef9e
Reviewed-on: https://code.wireshark.org/review/16425
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-07-15 14:21:46 +00:00
Kim Kempf 1bd438ba52 Adding 802.1BR E-Tag dissector
Based on IEEE Std 802.1BR-2012

Bug: 12613
Change-Id: Ic5198471f67a1af728df40a09443a1cab2621169
Reviewed-on: https://code.wireshark.org/review/16402
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-13 21:58:38 +00:00
Pascal Quantin fdd87a1e41 Network-Based IP Flow Mobility (NBIFOM) dissector
Based on 3GPP 24.161 V13.1.0

Change-Id: I7bf635c862bf7e0b73fd05bc8a55c900d1f4dd87
Reviewed-on: https://code.wireshark.org/review/16291
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-05 00:06:38 +00:00
Peter Wu 4add8b6b45 cmake: add idl2wrs-dissectors target for DCERPC
Add a callable target such that dissectors can be generated without the
AUTOGEN_dcerpc option.

Modelled after the pidl CMakeLists.txt file and target. This approach
has the advantage over the previous implementation such that the clean
target does not remove the packet-dcerpc-X.c files.

Change-Id: I3226937eaa76dffa253df9d4f989421d5faa3f3f
Reviewed-on: https://code.wireshark.org/review/15989
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-27 21:08:45 +00:00
Peter Wu deef1dc1ff cmake: add PIDL dissector generation support
The dissectors list is generated based on regex magic on pidl/Makefile.
A dssetup.cnf file is added because all other protocols already have
this file. The srvsvc and wkssvc protocols cannot be built for some
reason, so just disable it (this mirrors the original Makefile).

Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing
compared to autotools.

Tested with an out-of-tree and in-tree build with cmake (make and ninja):

    cmake -GNinja && ninja -v pidl-dissectors
    touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs
    cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs

Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03
Reviewed-on: https://code.wireshark.org/review/15962
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-19 02:28:53 +00:00
Jaap Keuter c98b0d574d Add Cisco ttag dissector
Add dissector for Cisco ttag protocol.

Bug: 12518
Change-Id: Id17293a80b2b6827fd2d5c7ead098784c35a28ef
Reviewed-on: https://code.wireshark.org/review/15964
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-16 19:00:39 +00:00
Pascal Quantin 51dd96fbb8 Fix OSX buildbot
Dirty CORBA IDL dissectors must be compiled without -Werror option

Change-Id: I46431c635274399cd6d365a608cdc0aecbc59c95
Reviewed-on: https://code.wireshark.org/review/15911
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-14 23:40:14 +00:00
Pascal Quantin 581a17af40 CORBA IDL: compile dissectors with /Ox when using MSVC2013 x64
By default Windows files are compiled with /O2 optimization flag (that brings the best performance).
But MSVC2013 x64 compiler generates buggy code for CORBA IDL dissectors.
Let's downgrade the optimization to /Ox for those files specifically.

Bug: 12495
Change-Id: Ibbb532653808d915c82bd20b55dd9e68d86b1207
Reviewed-on: https://code.wireshark.org/review/15884
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-14 21:57:41 +00:00
Alexis La Goutte cecb227af5 Add dissector for Real Time Location System (RTLS)
Change-Id: I494cbb8c3c6da18dfd7901d098dde6448226f67e
Reviewed-on: https://code.wireshark.org/review/15711
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14 15:44:27 +00:00
Andreas Leibold 720b47fe63 Updates on AVB IEEE 1722 protocol to support more 1722 subtypes.
packet-ieee1722.c now contains the entire protocol.
packet-ieee1722a.c file was removed, because the term 1722a is outdated
and now part of 1722 protocol.

Change-Id: Ic2f44a2752f9254cde62d878dc971f09cddc5adc
Reviewed-on: https://code.wireshark.org/review/15810
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-13 21:40:36 +00:00
Benoît Canet 69a2585147 Apache Cassandra CQL protocol v3.0
Change-Id: I74cddcce3104da269e9587ee78ff29785734188f
Reviewed-on: https://code.wireshark.org/review/12479
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-01 06:37:47 +00:00
Adam Goldman ba3f4f991c opa: Add dissectors for Intel’s Omni-Path Architecture (OPA)
Added dissectors for OPA Fabric Executive (FE) Header, OPA Snoop and
Capture (SnC) MetaData Header, OPA 9B Packets, and OPA MAD Packets.

Bug: 12114
Change-Id: I6acd3c9e266e4b638167abbdd275ec7c1d472b4f
Reviewed-on: https://code.wireshark.org/review/13473
Reviewed-by: Adam Goldman <adam.goldman@intel.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-17 18:05:54 +00:00
Gerhard KHUENY e2b144ff78 Added Bachmann bluecom protocol
Bug: 12379
Change-Id: I2a6e779e28cd63c2bba6b2c075850f47162e9c7f
Reviewed-on: https://code.wireshark.org/review/15119
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-03 12:29:40 +00:00
Graham Bloice 2e23b506c7 Add checkAPI calls to CMake.
This generates a top level target, checkAPI, that is
excluded from the ALL build target, so must be run separately.

On Windows using a Visual Studio generator, call
msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj

Change-Id: I44a57c564dcfc75499463b942436f4b920a82478
Reviewed-on: https://code.wireshark.org/review/14873
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-05-02 12:01:24 +00:00
Petr Sumbera 0b824d41c2 Support for Oracle Solaris ECP/VDP dissection based on IEEE 802.1Qbg Draft 2.1.
Bug: 12272
Change-Id: I9e58187695ceef089b452657d2fe60400114f522
Reviewed-on: https://code.wireshark.org/review/14866
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-19 05:06:31 +00:00
Mike Morrin 006d9821f6 Adding a dissector for the Distributed Object Framework protocol.
The DOF is part of the open-source OpenDOF Project,
more information at https://opendof.org

There is a sample capture file (with encryption keys) at
https://wiki.wireshark.org/SampleCaptures#DOF_.28Distributed_Object_Framework.29_Protocols

Change-Id: I8d8ce3edf39904d0467a403157f9de2d2a165e90
Reviewed-on: https://code.wireshark.org/review/14394
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-14 12:27:24 +00:00
Michal Labedzki 26cf83504b Bluetooth: Add BR/EDR RF dissector
Bluetooth BR/EDR RF dissector is pseudoheader with some
useful information to decode Bluetooth air packets.
This implements LINKTYPE_BLUETOOTH_BREDR_BB assigned
by tcpdump group.

Change-Id: I751d1f5d9c15650d93e6e8b2cc94294eb48c73de
Reviewed-on: https://code.wireshark.org/review/14760
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-12 00:34:39 +00:00
Michael Mann e37275bfde Associate dissector tables and heuristic subdissector lists with a protocol.
This will make it easier to determine protocol dependencies.

Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used)

Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d
Reviewed-on: https://code.wireshark.org/review/14446
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-17 00:05:17 +00:00
Guy Harris 42a78060d5 More sorting.
Change-Id: Iad364a735d348913d7bc8936dbb2c8543801fe7e
Reviewed-on: https://code.wireshark.org/review/14464
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 10:23:17 +00:00
Guy Harris c9d4d61bce More sorting.
Change-Id: Ia1b2cef56ae1ca16598ab757a730c80bb20beca5
Reviewed-on: https://code.wireshark.org/review/14462
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 10:14:52 +00:00
Guy Harris 9e1aee97e5 Move some non-ASN.1 dissectors out of the ASN.1 dissectors list.
Sort the list of PIDL dissectors while we're at it.

Change-Id: Ice90bf9b14b440fdfe59d1639fc0674e326a9923
Reviewed-on: https://code.wireshark.org/review/14461
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 10:10:01 +00:00
Moeller, Thies fd396ec650 packet-u3v.c lost after cmake build cleanup
fixes 6b54fbf3bf

Change-Id: If3b911dd8124a53b91d1ac2b35ea1dad0eec4802
Reviewed-on: https://code.wireshark.org/review/14459
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 09:34:53 +00:00
João Valverde 54a520d4a1 Move /asn1 to /epan/dissectors
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9
Reviewed-on: https://code.wireshark.org/review/14388
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-13 21:30:24 +00:00
Paulo Roberto Brandão 55fd97e73d ISO 8583-1 dissector initial import
Initial import of source code for the dissector of the ISO 8583-1
'financial transaction card originated messages - Interchange
message specification' standard.

Bug: 12244
Change-Id: I24804cab4a93131ec9afa307844ad62eb2e01089
Reviewed-on: https://code.wireshark.org/review/14311
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-13 17:39:32 +00:00
David Snowdon d12bd52a52 Added dissector for Metamako trailers.
Change-Id: Ib9dc712f58b9e579ad8ef027864db0a1b31ebf52
Reviewed-on: https://code.wireshark.org/review/14282
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-08 11:01:29 +00:00
João Valverde 4fca153089 Add missing cmake custom source includes
Change-Id: Ib1c1632a3e9fe1088a9a1da9870a81b1f846cf95
Reviewed-on: https://code.wireshark.org/review/14291
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03 03:45:58 +00:00
João Valverde 6b54fbf3bf CMake: Add more structure to libwireshark build
Smaller epan/CMakeLists.txt is easier to work with and this structure
is well suited to CMake. It should make it easier to manage and configure
each epan module differently if necessary.

Change-Id: Ia649db3b7dcd405aa43dbdba3288699d5e375229
Reviewed-on: https://code.wireshark.org/review/14068
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-01 19:23:39 +00:00
Jörg Mayer ec7380a6b1 Creatig static sublibs was not a good idea:
=========================================================================
 "du -s build" with sublibs:
 396868  build
 -----------------------------------
 "du -s build" without sublibs:
 197588  build/
 =========================================================================
 tshark with sublibs:
 -rwxr-xr-x 1 jmayer users 27399706 2009-10-11 08:39 tshark*
 -----------------------------------
 tshark without sublibs:
 -rwxr-xr-x 1 jmayer users  226748 2009-10-11 09:05 tshark*
 =========================================================================

So undo the following patches:

 ------------------------------------------------------------------------
 r30459 | krj | 2009-10-10 07:08:48 +0200 (Sa, 10 Okt 2009) | 1 line
 
 Sort subdirectories alphabetically
 ------------------------------------------------------------------------
 r30458 | krj | 2009-10-10 07:03:36 +0200 (Sa, 10 Okt 2009) | 1 line
 
 Add epan/dissectors/CMakeLists.txt which creates a static dissectors library
 ------------------------------------------------------------------------
 --> readd!! *** r30443 | krj | 2009-10-09 21:43:42 +0200 (Fr, 09 Okt 2009) | 1 line
 
 Rename DISSECTOR_ASM_UTILS to LIBWIRESHARK_ASM_FILES since these files belongs to ep
 an not dissectors
 ------------------------------------------------------------------------
 r30442 | krj | 2009-10-09 21:17:26 +0200 (Fr, 09 Okt 2009) | 1 line
 
 Add epan/ftypes/CMakeLists.txt which creates a static ftypes library
 ------------------------------------------------------------------------
 r30441 | krj | 2009-10-09 21:13:01 +0200 (Fr, 09 Okt 2009) | 1 line
 
 Add epan/dfilter/CMakeLists.txt which creates a static dfilter library
 ------------------------------------------------------------------------
 r30440 | krj | 2009-10-09 21:05:29 +0200 (Fr, 09 Okt 2009) | 1 line
 
 Add epan/crypt/CMakeLists.txt which creates a static crypt library
 ------------------------------------------------------------------------
 r30439 | krj | 2009-10-09 20:22:22 +0200 (Fr, 09 Okt 2009) | 1 line
 
 Add epan/crc/CMakeLists.txt which creates a static crc library
 ------------------------------------------------------------------------

To avoid merge problems, I needed to revert r30443 as well, will readd this
one in my next patch.

svn path=/trunk/; revision=30494
2009-10-11 07:28:26 +00:00
Kovarththanan Rajaratnam bf2ec50430 Autogenerating epan/dissectors/dcerpc/* now works
svn path=/trunk/; revision=30465
2009-10-10 08:10:28 +00:00
Kovarththanan Rajaratnam 64e717ee94 First stab at autogenerating budb dissector
svn path=/trunk/; revision=30463
2009-10-10 06:45:04 +00:00
Kovarththanan Rajaratnam 142131917c Compile and link idl2wrs
svn path=/trunk/; revision=30460
2009-10-10 05:35:21 +00:00
Kovarththanan Rajaratnam c3f68b724d Add epan/dissectors/CMakeLists.txt which creates a static dissectors library
svn path=/trunk/; revision=30458
2009-10-10 05:03:36 +00:00