Commit Graph

494 Commits

Author SHA1 Message Date
Gerald Combs 3f247a5cee Be less aggressive about rebuilding sminmpec.c.
Instead of forcing developers to generate sminmpec.c (which will have
different results depending on the presence or absence of a working
Internet connection) add sminmpec.c back to the repository. I'll add
it to the weekly update-numbers script so that it will be updated at
the same time as manuf, services, enterprise-numbers, and usb.c.

Change the Autotools, CMake, and Nmake sminmpec.c target name to
"update-sminmpec".

Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers
and sminmpec.c while we're here.

Tested with an in-tree Autotools build and an out-of-tree CMake build.

Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026
Reviewed-on: https://code.wireshark.org/review/1516
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-09 09:03:24 +00:00
Sean O. Stalley ac99cfd0d2 Media Agnostic USB Packet Dissector
This dissector dissects MA USB Packets. It is capable of dissecting
Media Agnostic packets both in a TCP stream as well as packets sent
over SNAP (referred to in spec as "Raw Ethernet" mode).

Change-Id: I3ad4e1beb891f9c2835adff320095e7e738241eb
Signed-off-by: Sean O. Stalley <sean.stalley@intel.com>
Reviewed-on: https://code.wireshark.org/review/1252
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05 13:49:56 +00:00
Michael Mann bf3fbb394f Add dissector for 3GPP2 A21/S102 protocol.
Change-Id: I611c217e1eec47da7427c0317ed9416b4c52411a
Reviewed-on: https://code.wireshark.org/review/1487
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 04:28:57 +00:00
Jakub Zawadzki 5f239013e7 wmem: add new simple block allocator, use it in packet-scope.
For packet-scope allocation, there's no need to support realloc(), free()
cause memory will be garbage collected after packet dissection.

(and this allocator is much faster than full block allocator).

Change-Id: I73fdf708c3077f48f55bdcc71f4fa859e4ac2335
Reviewed-on: https://code.wireshark.org/review/1428
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 21:07:07 +00:00
Marcel Essig 34fa169719 Add a new Dissector for HiSLIP
Change-Id: I87aaf4c8093ee8013a661aa8af81dba63eaa7086
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1337
2014-05-02 13:39:42 +00:00
Philip Rosenberg-Watt cd68b4744c Add dissector for LINKTYPE_EPON
See IEEE Standard 802.3-2012 Section 5, Clause 65 and CableLabs DPoE
Security and Certificate Specification 1.0, Section 6.

Currently dissects 1G mode. 10G mode will be added when hardware is
available.

Change-Id: I6232af9bf6807644ef66a120d97e5fa5927988fe
Reviewed-on: https://code.wireshark.org/review/1284
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-28 15:26:32 +00:00
Michael Mann 5ce5d0677e swIPe IP Security Protocol
bug:9996
Change-Id: I7c7ab7dfa81e44d6bf9affe7bfb0cd9f0a221adf
Reviewed-on: https://code.wireshark.org/review/1379
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-27 20:55:58 +00:00
Evan Huus fbc522633e Revert "Move kerberos to dirty list in CMake"
it no longer has any warnings

This reverts commit 30c9f421c0.

Change-Id: I5cc71f905ffa4f00ffb44ad7d03b2684c2e44e38
Reviewed-on: https://code.wireshark.org/review/1316
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-24 02:16:37 +00:00
Evan Huus 30c9f421c0 Move kerberos to dirty list in CMake
As pointed out by David Ameiss, I only did automake the first time round.

Change-Id: Ie72ab5014d8f21d194d15af430c6c0a8a612f5f7
Reviewed-on: https://code.wireshark.org/review/1309
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-23 19:20:14 +00:00
Evan Huus 9ba4c6e091 Hash map implementation for wmem.
This has two expected uses:
- Many current users of wmem_tree don't actually need the predecessor lookup
  it provides (the lookup_le function family). A hash map provides straight
  insertion and lookup much more efficiently than a wmem_tree when predecessor
  lookup isn't needed.

- Many current users of glib's hash table and hash functions use untrusted data
  for keys, making them vulnerable to algorithmic complexity attacks. Care has
  been taken to make this implementation secure against such attacks, so it
  should be used whenever data is untrusted.

In my benchmarks it is measurably slower than GHashTable, but not excessively
so. Given the additional security it provides this seems like a reasonable
trade-off (and it is still faster than a wmem_tree).

Change-Id: I2d67a0d06029f14c153eaa42d5cfc774aefd9918
Reviewed-on: https://code.wireshark.org/review/1272
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-23 12:42:26 +00:00
Alexis La Goutte 0601a8b54a Move packet-kerberos to ASN1 dissector
Change-Id: Ib4c97cb654b744bdc65155a0f97b3e944486fc30
Reviewed-on: https://code.wireshark.org/review/1200
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-18 22:00:04 +00:00
Michael Mann 8055351c6d Add SPDY dissector (from SPDYSHARK)
Porting SPDYSHARK Plugin ( http://code.google.com/p/spdyshark/) to built-in dissector

Closed-bug: 9821
Change-Id: I3169ab49e67f67a17e4094a289f4d3a389d610bc
Reviewed-on: https://code.wireshark.org/review/767
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15 23:19:43 +00:00
Martin Kaiser 537a02b365 start a dissector for Ethernet Local Management Interface
Change-Id: I332bd690be67c908067c12e570f993565de98aed
Reviewed-on: https://code.wireshark.org/review/1159
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-15 21:30:25 +00:00
Joseph Huffman fad0aa0382 Addition of AllJoyn packet dissector. Bug 9361
Change-Id: Ia582732ee27ce9c1e4280afef5a6b3e3be959d23
Reviewed-on: https://code.wireshark.org/review/1127
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-14 17:57:02 +00:00
Michael Mann 4990a8e4ee Added support for MQTT protocol. Bug 9930
Change-Id: I04fc3a6225c56af9905f4f9bbbca5bc10f214843
Reviewed-on: https://code.wireshark.org/review/873
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-09 22:35:08 +00:00
Guy Harris 130b94fa61 Sadly, packet-dcerpc-mapi.c is not yet free of warnings.
Change-Id: Ic208c89a915fc34d0f42ce788a60aa15029d105b
Reviewed-on: https://code.wireshark.org/review/1036
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09 02:02:26 +00:00
Guy Harris d8a647ece1 OK, that might mean packet-dcerpc-mapi.c now has no warnings.
Change-Id: I22688f0a9b6c04b1e0e9f16c92e7c0713610854c
Reviewed-on: https://code.wireshark.org/review/1035
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09 00:58:56 +00:00
Michael Mann 2f4ca9c8d9 Initial checkin of LBM aka 29West dissectors. See Bug 9718.
Change-Id: If8fcfe1971c8863f370e440f64c36eb7566f6852
Reviewed-on: https://code.wireshark.org/review/113
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-07 23:28:46 +00:00
Michael Mann 9fa48e3796 New DCE/RPC MDSSVC dissector. Bug 9950
Change-Id: I8832c139938e767de71b2cc74ca41208f509e478
Reviewed-on: https://code.wireshark.org/review/959
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-04 23:04:47 +00:00
Evan Huus b238cd1541 Scrap wmem splay trees for now.
There is confusion about API usage, and problems on my part concerning whether
keys should be compared signed or unsigned, and how to do that efficiently.
Unsigned keys in particular were behaving oddly.

Change-Id: I075693bbd04c15f79f24f9a24006003a914cc572
Reviewed-on: https://code.wireshark.org/review/924
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-02 17:14:16 +00:00
Guy Harris fc48f57214 Add a dissector for Apple's PKTAP headers.
It automatically works for LINKTYPE_PKTAP and, by default, for
LINKTYPE_USER2; if any other dissector is specified for LINKTYPE_USER2,
that dissector overrides PKTAP.

Change-Id: Ic00ac8a81c6101e45d638d337aef42df3920da12
Reviewed-on: https://code.wireshark.org/review/903
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-01 17:03:29 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Evan Huus 7df883954e Splay tree implementation for wmem
This is a tree implementation intended to replace the current red-black tree in
wmem_tree (which was inherited from emem), assuming there are no regressions.
Splay trees bubble recently accessed keys to the top, and as such have a number
of very nice properties: https://en.wikipedia.org/wiki/Splay_tree

This implementation is a variant known as "independent semi-splaying", which has
better practical performance. It should do about as well as the red-black tree
for random insertions and accesses, but somewhat better for patterned accesses
(such as accessing each key in order, or accessing certain keys very
frequently).

There are a few other changes relative to the red-black tree implementation that
are worth mentioning:
 - Instead of requiring complex keys to be split into guint32 chunks and doing
   this weird trick with sub-trees, I let the keys be arbitrary pointers and
   allowed the user to specify an arbitrary comparison function. If the function
   is NULL then the pointers are compared directly for the simple integer-key
   case.
 - Splay trees do not need to store a red-black colour flag for each node. It is
   also much easier to do without the parent pointer in each node. And due to
   the simpler system for complex keys, I was able to remove the "is_subtree"
   boolean. As such, splay nodes are 12 bytes smaller on 32-bit platforms, and
   16 bytes smaller on a 64-bit platform.

All done in about half the lines of code.

Change-Id: I89fb57e07d2bb7e3197190c7c2597b0c5adcc03b
Reviewed-on: https://code.wireshark.org/review/758
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-29 18:01:55 +00:00
Andreas Leibold f5cfcf6e42 ieee1722a dissector added
Change-Id: I4361e282146d86057d6797bc001f6605d5d06486

Whitespaces removed, Code clean up, usage of expert information API

Change-Id: I4361e282146d86057d6797bc001f6605d5d06486

code beautyfying, modeline added

Change-Id: I4361e282146d86057d6797bc001f6605d5d06486

code beautyfying

Change-Id: I4361e282146d86057d6797bc001f6605d5d06486
Reviewed-on: https://code.wireshark.org/review/430
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21 15:12:38 +00:00
cbontje fff998d6c1 New Dissector for Landis & Gyr (Telegyr) 8979
Commit includes dissector code for lg8979 as well as additions to RTAC Serial code to call dissector when required.

See bug report 9874 for further details and sample pcap files

UPDATE1: L&G 8979 commit for addressing comments from Anders and Alexis and added Cmakelists.txt
UPDATE2: address further comments from Alexis re. proto_item_set_text / proto_item_add_text entries.  Also add modelines
UPDATE3: fix compilation error noted by Alexis
UPDATE4: address proto_tree_add_* comments from Michael

Change-Id: I6e69d2b7b7e91e6efa12e4a5fb7dbd140c0540ed
Reviewed-on: https://code.wireshark.org/review/610
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-19 05:07:34 +00:00
Michael Mann 09af140152 Add PDC dissector
Change-Id: I6eee13cda755b1f1d1a61288a6314fcebb681efb
Reviewed-on: https://code.wireshark.org/review/180
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-10 07:12:06 +00:00
Christopher Kilgour ef94a80bfa Introduces two new Bluetooth DLTs for RF-based captures.
Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing
BTLE dissector.

Fixes BTLE dissector to correctly extract packet CRC.

Adds CRC checking to BTLE dissector.

Provides optional context to BTLE dissector that allows RF captures to provide
link-layer hints for dissection details.  Significantly, parameters for
determining CRC correctness are provided, as well as Access Address validity
information.

Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb
Reviewed-on: https://code.wireshark.org/review/310
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-07 05:20:17 +00:00
Hanspeter Portner 93a59e74c3 Open Sound Control dissector.
Dissector for specification at http://opensoundcontrol.org/spec-1_0.

- use value_string
- add integer oferflow protection
- remove trailing white space
- add capture file to bug tracker: Bug 9837
- fix warnings by tools/fix-encodings-args.pl
- make use of VALS
- dissect MIDI controller messages separately

Change-Id: Iab0dc01d4bf1c08eac175b6af1dd07809090c35a
Reviewed-on: https://code.wireshark.org/review/454
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-06 09:21:54 +00:00
Michal Labedzki 7a008e4f81 cmake: Add missing exported_pdu dissector
Change-Id: I9a6a91b11555e2b271b3d359f26bf97796d6742f
Reviewed-on: https://code.wireshark.org/review/495
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 12:14:42 +00:00
Stefan Metzmacher 8fe9187b98 packet-smb-direct.c: add initial implementation
See [MS-SMBD] http://msdn.microsoft.com/en-us/library/hh536346.aspx

Change-Id: If2cf719bdf5da82bc5f5e086dd69d02caff2166a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/55
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 21:58:26 +00:00
Michal Labedzki b14cf15010 Android: Add support for ADB Client-Server protocol
ADB Client-Server Protocol is protocol between adbd
(ADB Daemon aka Server) and adb client (aka adb).
Typically you can find it on "lo" interface over TCP protocol.

Change-Id: Iad008560c983f5ede554e1eaa728d703aae95eed
Reviewed-on: https://code.wireshark.org/review/233
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-20 22:02:59 +00:00
Michal Labedzki 4624d6d457 Android: Add support for Logcat dissector
Supported is Binary Logcat/Logger, aka adb logcat -Bf /sdcard/log.logcat

Change-Id: I883c6d746ec4fe67ef4ce15ca4227adce407fb76
Reviewed-on: https://code.wireshark.org/review/232
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18 11:12:40 +00:00
Owen Williams 5eb4b6218c VP8 RTP dissector
Change-Id: Ic21d13bf8ca77ff37c2d2d229c4e8c9d8f053677
Reviewed-on: https://code.wireshark.org/review/124
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10 19:11:37 +00:00
Gerald Combs f966980937 Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.

Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-07 23:03:03 +00:00
Alexis La Goutte 2c3f022314 Add Aruba Intant AP dissector
There is no public spec, based only on analyze of packet
It is more easy to found the address IP of Intant AP

Change-Id: I3baf205c5e4ad699b954f4a9fbf4b9e65f82cb36
Reviewed-on: https://code.wireshark.org/review/121
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-05 15:28:48 +00:00
Jelmer Vernooij 53404776be Split out bencode dissector and use it in the bzr dissector.
Change-Id: I5b2ef173faf7670fad64298d67f2aaf055b8d6d8
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-on: https://code.wireshark.org/review/82
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-04 14:24:13 +00:00
Martin Kaiser 06510129bb dissector for HDMI (High-Definition Multimedia Interface)
messages on the Data Display Channel (DDC)

this dissector is available as an option for I2C messages

it handles EDID messages (Extended Display Identification Data)
and passes HDCP messages on to the HDCP dissector

Change-Id: Ia8d8e73c36e2a1ad560b911dd4c1c9f34997b5c2
Reviewed-on: https://code.wireshark.org/review/63
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-02-02 17:41:35 +00:00
Martin Kaiser 5f91002cf5 replace spaces with a TAB
Change-Id: I8340b4af524b5c4ffb1a10b0eccd809f1d6b1e9f
2014-01-29 23:24:47 +01:00
Michal Labedzki 2c28c5d93f MIME: Rename image dissectors to file dissectors.
Change-Id: Ie160733ceeed23ff96ddccfbf0ca2e7694789ff8
2014-01-29 23:17:33 +01:00
Alexis La Goutte d2410336b8 From Lubos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9638
New Dissector For Lightweight Mesh protocol

A dissector for ATMEL Lightweight Mesh protocol (lwm).
The protocol is carried on the top of 802.15.4 frame.

From me:
* Add Modelines info
* Fix indent (use 4 spaces)
* Remove trailing whitespace

svn path=/trunk/; revision=54856
2014-01-20 18:35:45 +00:00
Alexis La Goutte 4cf9cd343f From Kevin Loewen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9631
Add dissector for Pathport Protocol

From me :
* Fix indent (use 4 spaces)
* Remove unused variable and fix Clang warning

svn path=/trunk/; revision=54729
2014-01-13 22:24:53 +00:00
Michael Mann c071a1c728 Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606)
From Michal Labedski

1. add support for new btsnoop "format" introduced by BlueZ team in "btmon" tool
2. Bluetooth: Make EIR, AD and COD more generic
3. Bluetooth: HCI/LL: Update Error Codes to Core 4.1  Specification
4. Ubertooth: Fix response command handling
5. Ubertooth: Update to support firmware version
6. Ubertooth: Dissect by Vendor Id/Product Id

svn path=/trunk/; revision=54699
2014-01-12 00:50:41 +00:00
Michael Mann f42fa7abf1 USB: Add DFU dissector. Bug 9610 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610)
From Michal Labedzki

svn path=/trunk/; revision=54683
2014-01-09 21:42:36 +00:00
Michael Mann df3d47aebc Base dissector for fileshark functionality. Intended as the equivalent of packet-frame for capture files. This is meant as a placeholder for now, so don't take any of the fields/data as being written in stone.
svn path=/trunk/; revision=54613
2014-01-06 00:44:41 +00:00
Anders Broman b22d9ab940 Disabling building of the gnm dissector, I don't tink it was ever used.
svn path=/trunk/; revision=54561
2014-01-02 18:01:33 +00:00
Martin Kaiser 43e892e985 From Dirk
dissector for Novell's PKIS certificate extensions

from me
clean up the $Id$ tags
remove packet-pkis(-template).h
remove ASN.1 definitions that cause compiler warnings
   (OID, SecurityLabelType2)
move the dissector to the clean ASN.1 dissectors
support CMake build
change the name to novell_pkis

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9597

svn path=/trunk/; revision=54508
2013-12-31 14:20:08 +00:00
Michael Mann 58346b6327 Move tcap and camel "persistent data" functionality to the dissectors themselves instead of being part of epan directory.
svn path=/trunk/; revision=54499
2013-12-30 22:07:38 +00:00
Michael Mann 57a62f7a4d New dissector for the CCSDS CFDP protocol. Bug 9517 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9517)
From Juan Antonio

svn path=/trunk/; revision=54482
2013-12-29 15:28:49 +00:00
Michael Mann d3ed64d8e3 Add ZigBee Green Power dissector. Bug 9424 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9424)
From DSR Corporation

svn path=/trunk/; revision=54478
2013-12-28 12:26:37 +00:00
Alexis La Goutte e32d169edf From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122

NFC: Add ACR122 USB dongle dissector

ACS ACR122 is compatibile with PN532, but has its own API. Dissect it.

svn path=/trunk/; revision=54406
2013-12-23 18:56:19 +00:00