Commit Graph

56635 Commits

Author SHA1 Message Date
Sebastian Kloeppel 6010d99a1f Added Card Application Toolkit Transport Protocol (CATTP) dissector
Bug: 10843
Change-Id: I35350d98b4225be12875b16e67506f7385ea9f28
Reviewed-on: https://code.wireshark.org/review/6111
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-17 20:22:55 +00:00
Russel ffa8bdd3ca Correct PF field offset when looking for DA
Previous code was not shifting far enough, was checking PS instead
of PF.

Change-Id: Ic0bdbb4dfaa7bdd708a49f1fb67706dd949f2607
Reviewed-on: https://code.wireshark.org/review/6578
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 20:21:44 +00:00
Martin Kaiser 8ec6ac6969 dissect CCRC, APRC and the APDU body's data
Change-Id: I21f7420286ed3e668ce4dc0eac06bbf4172039d6
Reviewed-on: https://code.wireshark.org/review/6588
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-17 18:46:30 +00:00
Martin Kaiser 21e40ea068 dissect the serial characters and the CRC
Change-Id: I64af822f30b02d313f5242014ff5e40a73dffa35
Reviewed-on: https://code.wireshark.org/review/6587
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-17 18:41:50 +00:00
Alexis La Goutte a38b714908 RSYNC: Malformed Packet on rsync-version with length 2
RSYNC dissector always think the resync-version length = 4

Bug:10863
Change-Id: I2dee3ff7195af110223903d79b938849666878a7
Reviewed-on: https://code.wireshark.org/review/6584
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-17 15:47:21 +00:00
maisheri aa1057daba EAPOL-MKA: Included fixes for the distributed sak handling.
Change-Id: Id91ba408266f18a9336811bf9d8b875796ea0cc1
Reviewed-on: https://code.wireshark.org/review/6582
Reviewed-by: maisheri <maisheri.hitesh@gmail.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>
2015-01-17 15:03:18 +00:00
Guy Harris 62ea3194ed PacketLogger files can be big-endian or little-endian.
Bug: 10861
Change-Id: Iedb248aa4a96e65bb525ba6475dc767e5dfefbe0
Reviewed-on: https://code.wireshark.org/review/6579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-17 02:59:59 +00:00
Pascal Quantin 3f284fbca4 USB: do not put usb_address_t structure on stack and initialize it completely (including implicit padding for alignment)
Bug: 10857
Change-Id: Ib8339a5dc1c9461e681e0015c3f851c642f300c9
Reviewed-on: https://code.wireshark.org/review/6560
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-16 22:55:10 +00:00
Pascal Quantin 1e8c6eef4a Update a comment
Change-Id: I7bf1173bfb23e5f083b8aaf09476b30b4791aae0
Reviewed-on: https://code.wireshark.org/review/6577
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-16 21:31:14 +00:00
Guy Harris fa5478185c Update comment to reflect the current reality.
Change-Id: I7f8c66723efc9d21ec3abc08e57db1df5f772f04
Reviewed-on: https://code.wireshark.org/review/6576
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-16 19:26:50 +00:00
Guy Harris 23666badc5 Spaces separate bytes; they don't have to surround them.
I.e., you don't need a trailing blank, at least not with the current
version (and there shouldn't be a requirement for such an extra trailing
blank).

Change-Id: Ia2b732c74fc6020acc01a2c0c52ed3567d36d762
Reviewed-on: https://code.wireshark.org/review/6575
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-16 18:41:39 +00:00
Alexis La Goutte b6ec25f0b2 IS-IS: Add missing i variable for subclv loop (IS Reachability)
Issue found by Alexander Okonnikov

Change-Id: I4eacab63a685b84c0d75811b96dc452471244337
Reviewed-on: https://code.wireshark.org/review/6573
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-16 17:51:49 +00:00
Alexis La Goutte 22543d3cec IS-IS: wrong length for SubTLV 18 (TE default Metric)
Issue found by Alexander Okonnikov

Change-Id: I8c1da71183f5bba50bb0bb541c259d5dba0b067d
Reviewed-on: https://code.wireshark.org/review/6572
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-16 17:51:17 +00:00
Evan Huus 3f575120ea Kill more unused emem functions
Change-Id: Ib81410b6d760886f2ae585f44ac58fc135da62c7
Reviewed-on: https://code.wireshark.org/review/6568
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-16 17:36:15 +00:00
Alexis La Goutte 4fa73961f1 CMakeList.txt/Makefile.am (root) : fix indent (use tabs)
Makefile.am: avoid double space
CMakeList.txt: Add modelines info

Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925
Reviewed-on: https://code.wireshark.org/review/6570
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16 16:35:48 +00:00
Alexis La Goutte 16d367fef5 ZBee ZCL: use tvb_get_guint8() (avoid tvb_get_ptr... !)
Change-Id: I248ddb1dee5398528279807968b095cbc5413ae0
Reviewed-on: https://code.wireshark.org/review/6569
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16 16:34:00 +00:00
Michael Mann 531df02736 Remove se_ alloced memory from packet_list_store
Change-Id: I7aa2f5f8b433468ad2c2cd73cfce986d128a9ae0
Reviewed-on: https://code.wireshark.org/review/6565
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 16:03:58 +00:00
Pascal Quantin 0235775eee GSM SIM: enhance dissection of APDU Class byte
Change-Id: I2089ff665a92ce16a0af100e2515463c92c6d057
Reviewed-on: https://code.wireshark.org/review/6567
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-16 16:01:05 +00:00
Michael Mann ada1eec702 SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS
Copy addresses with wmem-scope instead of (forced) seasonal scope.  All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes.

Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2
Reviewed-on: https://code.wireshark.org/review/6564
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 15:25:18 +00:00
Michael Mann 260b19e98d Remove seasonal memory from everything except address resolutions
This includes circuits, conversations and streams as well as camel and h225 dissectors.

Change-Id: Ia5ee70a5e5c6bcb420f0f19df126595246a3c042
Reviewed-on: https://code.wireshark.org/review/6566
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16 15:22:27 +00:00
Chris Brandson b2c45864f9 bug 10833 undecoded bitmaps were being displayed raw which is hard to interpret, changed to an more friendly format
Change-Id: If79a695646837cdfb3e1b168a47b96984c58e328
Reviewed-on: https://code.wireshark.org/review/6563
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16 05:25:11 +00:00
Jeff Morriss a4d1709994 (Trivial) Move a comment next to the code related to it.
Change-Id: I83749a1b30059cc8e8f13b58fbde74e9ab873582
Reviewed-on: https://code.wireshark.org/review/6562
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-16 02:48:34 +00:00
Alexis La Goutte d009b55b9b Quakeworld: Nesting level does not match indendation (CID 1159218)
Change-Id: I6d18f103bda6db025eebfc902453256b007dddf7
Reviewed-on: https://code.wireshark.org/review/6556
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 00:52:07 +00:00
Michael Mann 3f8fbb7349 Remove the last two true calls to se_alloc.
(The other calls are just wrapped in macros)

Change-Id: I6a029dddf7742ba95510ec24cec30553461e48c6
Reviewed-on: https://code.wireshark.org/review/6558
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 00:38:36 +00:00
Michael Mann e530c89940 Replace se alloced memory in compare stat tap.
Also replaced comments mentioning se_alloc memory with wmem_file_scope, since it's more accurate.

It seems that many of the TShark stat taps may be leaking memory, because the hash tables created by the taps don't get a chance to be freed.  Somewhat academic since TShark exits shortly after displaying any stats, but a leak none the less.

Change-Id: I8ceecbd00d65b3442dc02d720b39c2e15aa0c8a6
Reviewed-on: https://code.wireshark.org/review/6557
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16 00:37:02 +00:00
Deon van der Westhuysen 7d43836b3a QT: stats_tree plug-ins not added to statistics menu
Wireshark Qt does not add plug-ins that register with stats_tree_register_plugin() to the statistics menu in the ui (like the gtk version does).

This patch dynamically adds all registered stats_tree plug-ins to the statistics menu.

Bug: 9528
Change-Id: I99f9415502ca9f7121d494c856861edc1a762079
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/6336
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-16 00:27:35 +00:00
Michael Mann d5ee022b9e Replace C++ style comment with C style.
Change-Id: Ibee0dccdb5a330866dcd0047216cd5a4da45fc8b
Reviewed-on: https://code.wireshark.org/review/6559
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-15 20:10:52 +00:00
Alexis La Goutte c610c38b6f Conversation Table : Copy-paste error (CID 1262415)
Change-Id: I37fd8154f93763ac091528921d1b66d8e8fd56dd
Reviewed-on: https://code.wireshark.org/review/6555
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-15 19:23:32 +00:00
Alexis La Goutte e75dd98b3d NetFlow: Assign instead of compare (CID 1262419 & 1262420)
Change-Id: Idc2c2e02b973f65c6c2f22f2d1bfd8545cd23f63
Reviewed-on: https://code.wireshark.org/review/6554
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-15 19:04:47 +00:00
Alexis La Goutte 1562827a80 Packet List (Qt): Missing break in switch (CID 1262418)
Change-Id: Id46f2be5b5206dfcb0ce7e7ea2d31398eff54917
Reviewed-on: https://code.wireshark.org/review/6552
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 18:56:39 +00:00
Alexis La Goutte 3385984dd2 Address to str: Missing break in switch (CID 1262416 & 1262417)
It will also fix "Unused Value" (CID 1262422)

Change-Id: I626c087365e9d6fe625f807ab8ded518d94cab64
Reviewed-on: https://code.wireshark.org/review/6553
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-15 18:51:00 +00:00
Alexis La Goutte adf088173a HTTP: fix implicit conversion shortens 64-bit value into a 32-bit value
It will be make Mac OS X buildbot happy

Change-Id: I628445c1358675a58cc2d26ce1ca3007dd619ff3
Reviewed-on: https://code.wireshark.org/review/6551
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15 18:28:26 +00:00
Pascal Quantin 9c044e2ca4 ZigBee: packet scope memory cannot be used for BASE_CUSTOM callbacks
Change-Id: I28fe21151b9f8c91786ca6c56d141a458419c501
Reviewed-on: https://code.wireshark.org/review/6548
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-15 17:11:19 +00:00
Uli Heilmeier 69d32a99bb HTTP Dissector: Add CitrixAGBasic authentication
Citrix uses a proprietary authentication schema called CitrixAGBasic for
their StoreFront/Web Interface product.

The Header looks like:
Authorization: CitrixAGBasic username="dGVzdHVzZXI="; domain= \
       "dGVzdGRvbWFpbg=="; password="c2VjcmV0"; AGESessionId= \
       "YzI0NmRkMmFmYmE5ZTk5M2I5ZDRkN2UwYzYzZWExN2U="

This patch enhances the HTTP dissector to decode this authentication data.

Due to non-discolsure I can only provide a faked GET request as a pcap
capture (attached to this bug).

Bug: 10851
Change-Id: Ic8e48db94809c9c64889cd050911de3fe23cdcdd
Reviewed-on: https://code.wireshark.org/review/6526
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-15 16:55:21 +00:00
Gerald Combs e0539eda1c CMake: Rename the windeployqt variable.
The windeployqt variable name ends up in the cache. Change it to
QT_WINDEPLOYQT_EXECUTABLE, which follows conventions used in the Qt
CMake modules.

Change-Id: I14998b921009e44e5ca743e2915fe84447b22df0
Reviewed-on: https://code.wireshark.org/review/6549
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 16:54:44 +00:00
Graham Bloice 58bb07ba5c Fix-copy-qt-dll
The copy-qt-dll custom command should ensure the qt bin dir is on
the path.
Modify the flags passed to windeployqt depending on the configuration.

Change-Id: I12860d415f80cee323c72aa8a4892eaa6126f165
Reviewed-on: https://code.wireshark.org/review/6537
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 16:19:17 +00:00
Martin Kaiser a1fce22373 remove the executable bits from packet-zvt.c
(I should not use git on cygwin for adding new files)

Change-Id: I314d78073f1ebd633a20ff7c9ac3d0b236b3906a
Reviewed-on: https://code.wireshark.org/review/6547
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-15 15:21:19 +00:00
Martin Kaiser ba7aa190b3 start a dissector for ZVT Kassenschnittstelle
this is a protocol between payment terminals and
electronic cash-register systems / vending machines

Change-Id: Ieac87c0af8e15f2dfe8b4a6274f3b56d652a5b1f
Reviewed-on: https://code.wireshark.org/review/6531
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-15 15:07:53 +00:00
AndersBroman 1e1d96f108 Modify the errorcode defenition to suit ANSI MAP, this is (probably) OK as
ANSI MAP is currently the only user of ANSI TCAP.
Bug: 6112

Change-Id: I49f89c862ddc8351091a9a939415e4ba6e7603f5
Reviewed-on: https://code.wireshark.org/review/6546
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 15:05:04 +00:00
Evan Huus ef0435bdb5 ZigBee: don't use packet_scope outside of dissection
The decode_* functions defined here are called post-dissection for formatting
labels, so don't have access to packet scope. Just use and free manual memory.

Introduced in gbdfabe59.

Bug: 10855
Change-Id: I9b0085b1f7779ae6fbd12482c44d8f611cdbb49f
Reviewed-on: https://code.wireshark.org/review/6545
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-15 13:34:18 +00:00
Evan Huus c2350a5070 rsvp: fix typo
caught by test suite as:
Duplicate field detected in call to proto_register_field_array:
rsvp.call_attributes is already registered

Change-Id: Ibf4ead3026b9930fb8f6ab07f0a5a4c299cedc35
Reviewed-on: https://code.wireshark.org/review/6544
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-15 10:43:11 +00:00
Martin Mathieson 0d9248e125 Netflow: Fix spelling of 'latitude'
Change-Id: Iaae40f4a191e458645263c8d7a114392cd063707
Reviewed-on: https://code.wireshark.org/review/6543
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-15 09:42:41 +00:00
Alexis La Goutte adaa661b74 Update to libnghttp2 0.7.1
Change-Id: Ib8d40586a3b95674447819f77eaaa69376dce6fd
Reviewed-on: https://code.wireshark.org/review/6411
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15 08:34:38 +00:00
Miltos Patsiouras 5b92ab9f97 RSVP: Add support of GMPLS Support for Metro Ethernet Forum and G.8011 (RFC 6004)
This document describes a method for controlling two specific types
   of Ethernet switching via Generalized Multi-Protocol Label Switching
   (GMPLS).  This document supports the types of switching corresponding
   to the Ethernet services that have been defined in the context of the
   Metro Ethernet Forum (MEF) and International Telecommunication Union
   (ITU) G.8011.  Specifically, switching in support of Ethernet private
   line and Ethernet virtual private line services are covered.  Support
   for MEF- and ITU-defined parameters is also cover

Bug: 7841
Change-Id: I12e12d01d497bd0e9703efcf6bd8ad100805bccc
Change-Id: I180c095652604bc025ab81171dd8a042e0930f08
Reviewed-on: https://code.wireshark.org/review/5323
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15 08:33:48 +00:00
Alexis La Goutte 06ddb7e31d CAPWAP: Add a IEE802.11 Message Element Type (RFC5416)
* IEEE 802.11 Information Element (1029)

Add add_tagged_field to packet-ieee80211.h (will be used by other dissector)

Change-Id: Icd13be416ccc47fb2309b9962e9a47c339885d1e
Reviewed-on: https://code.wireshark.org/review/6524
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
2015-01-15 08:30:54 +00:00
Graham Bloice fcd2d4faa3 Fix cmake-cflags
The flags that are deleted are already supplied by the CMake generator.

Change-Id: Ifafc2343ac0c5d365a39f4a181b23f54c65bce74
Reviewed-on: https://code.wireshark.org/review/6538
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-15 07:17:04 +00:00
Alexis La Goutte cb1f8a3d2b CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)
* IEEE 802.11 OFDM Control (1033)
* IEEE 802.11 Update WLAN (1044)

Change-Id: I702de1d649b1dc2af1de83ee21152c6a18f42dfc
Reviewed-on: https://code.wireshark.org/review/6509
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 05:43:38 +00:00
Alexis La Goutte f6021e8d02 CAPWAP: Add a new Message Element Type (RFC5415)
* Delete Station (18)

Change-Id: I33afa96d183b8ff22725d2e00dcfeccea3fdfa04
Reviewed-on: https://code.wireshark.org/review/6508
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 05:40:51 +00:00
Alexis La Goutte d9ec8abaf8 mate_util: fix parameter ... not found in the function declaration [-Wdocumentation]
Change-Id: I66af53ee06866b45339814b5fa949551c0dd45c1
Reviewed-on: https://code.wireshark.org/review/6535
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 05:38:04 +00:00
Jeff Morriss 6f630c10a5 Fix the compile: Use the new (double) variable.
Change-Id: I38a9b0f55e9f19fe7f4f09f5eec2817dd822c6d0
Reviewed-on: https://code.wireshark.org/review/6542
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-15 02:05:43 +00:00