Commit Graph

58750 Commits

Author SHA1 Message Date
Gerald Combs fdb85029fd Add ServiceResponseTimeDialog.
Add ServiceResponseTimeDialog as a subclass of TapParameterDialog,
similar to StatsTreeDialog. Add initial plumbing for statistics menu
items and command line invocation.

Don't append "..." to menu item names. Don't add menu icons. In each
case this avoids repetitive UI clutter.

Change-Id: I463b95c93090160bb81d2e80b16aad389dc0bd6c
Reviewed-on: https://code.wireshark.org/review/8864
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03 23:09:13 +00:00
Michael Mann 7fdc534cf9 Convert BOOTP/DHCP tap stats to new "generic stat API".
Change-Id: I0edc3909516452e6497a050b4617f9aafcea2688
Reviewed-on: https://code.wireshark.org/review/9112
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03 23:08:51 +00:00
Michael Mann a8ff1e2778 Create very basic "generic" stat tap API to create a "GUI" independent table.
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API.  The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there.

Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt)

Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab
Reviewed-on: https://code.wireshark.org/review/9110
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03 23:08:28 +00:00
Martin Mathieson 09ea473cee bootp: try to fix OSX builtbot
Change-Id: I0204b6c947e302a6f38b43593e19c6b816a180a4
Reviewed-on: https://code.wireshark.org/review/9482
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-07-03 21:17:56 +00:00
Martin Mathieson ecc29ee7ec DHCP: Lookup OUI for TR111 suboption. Also add Ubiquisys OUI to oui_vals.
Change-Id: I49b833ee4df01d37cfabb11fd177c00f34f41eb4
Reviewed-on: https://code.wireshark.org/review/9481
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-07-03 20:23:46 +00:00
Bill Meier bd6065f13f [smb2] Update some comments
Change-Id: I95dc8743b6db579eb197bd64ab2f26cf43ebc308
Reviewed-on: https://code.wireshark.org/review/9480
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-07-03 14:58:50 +00:00
Guy Harris 363511cb67 Move some frame control field #defines to a header and use them elsewhere.
Move a bunch of #defines that involve the frame control field to
packet-ieee80211.h and have the WLAN statistics tap use them rather than
hardcoded numbers.

Change-Id: I893cc50e546af67c910755357cefd86c39a1c783
Reviewed-on: https://code.wireshark.org/review/9476
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-03 02:51:51 +00:00
Guy Harris df5a315048 Fix address resolution for columns.
Have address_to_name() be a routine that takes an address and returns a
string with a "sufficiently long" lifetime for use in columns, using the
address type's addr_name_res_str routine for most address types, rather
than having a too-small set of address types wired into it.  It replaces
both the internal solve_address_to_name() routine and get_addr_name(),
and can, for example, handle the special WLAN address types rather than
leaving them unresolved even with an ethers file.

Change-Id: Id09bc412adf5d2752155650a14a77c5378af2e42
Reviewed-on: https://code.wireshark.org/review/9475
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-03 02:21:20 +00:00
Pascal Quantin ed21afa952 LLDP: fix dissection of Power Class field
Bug: 11330
Change-Id: I865fe694706606c091a32f58a35658800a9dacc6
Reviewed-on: https://code.wireshark.org/review/9473
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-02 23:24:18 +00:00
Michael Mann bcf75333ff Add proper "Decode As" mechanism for NFS file handles instead of preference.
Change-Id: I8509b9290a7255a91fa5f10a8312ca80eb94ead6
Reviewed-on: https://code.wireshark.org/review/7900
Reviewed-by: Cal Turney <cturney@charter.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-02 19:50:01 +00:00
Pascal Quantin 7151029728 PEEKREMOTE: ensure to initialize mandatory fields in info_11ac structure
Bug: 11326
Change-Id: I5a438bda7448f6b6b9959bdc03b0252b3cf22697
Reviewed-on: https://code.wireshark.org/review/9469
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-02 19:17:58 +00:00
Guy Harris ccd552a838 Remove more unnecessary null checks.
These routines are called from dissect_bthci_evt(), which ensures that
bluetooth_data is non-null, and passes that non-null value to the
routines.

Should fix CIDs 1306908 and 1306911.

Change-Id: Ie25de02f36bda9a9ae25ced034e758fc7f745681
Reviewed-on: https://code.wireshark.org/review/9472
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-02 19:04:05 +00:00
Guy Harris 7e461a91bf Remove check for null bluetooth_data.
It's guaranteed to be non-null at that point. as noted by Coverity.

Should fix CID 1306904.

Fix indentation while we're at it.

Change-Id: I414844e9b6f9f01e215f42ba087a56b0544d289a
Reviewed-on: https://code.wireshark.org/review/9471
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-02 18:57:18 +00:00
anilkumar911 90af3dedd5 Interpret reserved fields netscaler header.
Change-Id: I64d6ae733bda880f5afbe1a755799823d835bfa4
Reviewed-on: https://code.wireshark.org/review/9466
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-02 18:45:05 +00:00
Guy Harris 622be70534 Zero out the nss array when we don't have the 802.11ac information we need.
Change-Id: I576be8c1a1badf6befe90a226f83e8d03f8326a7
Reviewed-on: https://code.wireshark.org/review/9470
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-02 18:26:27 +00:00
Pascal Quantin cd6977221a ixveriwave: fix what seems to be a copy/paste error
Change-Id: I79fc9b11fcdd54e0644d01b34a7f37644c85ad0f
Reviewed-on: https://code.wireshark.org/review/9468
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-02 18:08:03 +00:00
Pascal Quantin cc12a6ada6 RPC: do not add a protocol without dissection function to the dissector table
This seems to be a typo

Bug: 11327
Change-Id: I0182003b77f0deba9421002f5626175af30125f5
Reviewed-on: https://code.wireshark.org/review/9467
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-02 17:16:35 +00:00
AndersBroman 9421af309b Try to fix: warning C6244: Local declaration of 'airpcap_if_list' hides
previous declaration.

Change-Id: Id0c3b74ac52c427d9c1efdf749dc410bc5bb450f
Reviewed-on: https://code.wireshark.org/review/9460
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 15:28:03 +00:00
Pascal Quantin 523ce152e8 Do not try to display a value_string for FT_FRAMENUM type
The hfinfo->strings pointer is used to store a ft_framenum_type_t

Bug: 11325
Change-Id: Ia6ee1bdd4f1e6ff93907e6107fcecab56c0320de
Reviewed-on: https://code.wireshark.org/review/9458
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-02 11:36:11 +00:00
Michael Mann dcd7368474 Update Debian symbols for recent packet API additions.
Change-Id: Ib6e5a48fa0b0802c920e68d3dc7d62362818d36b
Reviewed-on: https://code.wireshark.org/review/9465
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-02 11:34:03 +00:00
AndersBroman 8b7f5f7f07 Update libwireshark0.symbols
Change-Id: I04cdba9633d3fc131ecd9dc218bc6dd458378a35
Reviewed-on: https://code.wireshark.org/review/9464
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 11:20:31 +00:00
AndersBroman 88302f267c Try to fix OSX build boot
lemon.c:1784: warning: implicit conversion shortens 64-bit value into a 32-bit value
lemon.c:1790: warning: implicit conversion shortens 64-bit value into a 32-bit value
1790: warning: implicit conversion shortens 64-bit value into a 32-bit value
1928: warning: implicit conversion shortens 64-bit value into a 32-bit value
2707: warning: implicit conversion shortens 64-bit value into a 32-bit value

Change-Id: Ief1b64009891de6885c2c9a6cb0e290752de889f
Reviewed-on: https://code.wireshark.org/review/9463
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 11:09:36 +00:00
Hannes Mezger 051986ccf8 opcua dissector: Add DefaultXml encoding IDs
Currently only DefaultBinary encoding IDs can be displayed, this commit adds the DefaultXml encoding IDs

Change-Id: I19f3693d3aa03451655058770383222c3828b570
Reviewed-on: https://code.wireshark.org/review/9442
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-02 10:21:01 +00:00
Michael Mann 7d1a86d8c4 Have RPC dissector use real dissector tables for its subdissectors instead of a "homegrown" method.
Change-Id: I06d7d4e9747ed8593cf40506cae3a09ae237846b
Reviewed-on: https://code.wireshark.org/review/9456
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 08:59:33 +00:00
Michael Mann cc7dc0332a Add support for a "custom" dissector table. This allows for a "custom" (not UINT or string) key to register dissector handles.
This was designed for RPC dissectors, but probably has use elsewhere.

Change-Id: I1bca6b50ba312129a0c4fad5cc3c18cd9297c217
Reviewed-on: https://code.wireshark.org/review/9455
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 08:58:46 +00:00
Michael Mann 987cf4cd16 Have RPC program hash table use native gtk hash functions.
Change-Id: Ie3c6daf69a1ac155ac09794a5ec87c89bbf0607d
Reviewed-on: https://code.wireshark.org/review/9454
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 08:56:05 +00:00
Michael Mann b68a0ed42e Replace RPC "dissect_function_t" function signature with "new style" dissector function signature.
This paves the way for using dissector tables.

Change-Id: I88ac165ef9aa5bf5c05e1115f7321e18e734d683
Reviewed-on: https://code.wireshark.org/review/9453
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 08:54:10 +00:00
Alexis La Goutte 9d8b810127 Lemon: Update lemon tools
Update from SQLite trunk (19 April 2015)

Add include <config.h>

Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_)

Fix implicit conversion loses integer precision

Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]

Fix function declaration isn’t a prototype [-Wstrict-prototypes]

Fix warning: old-style function definition [-Wold-style-definition]

Fix trailing whitespace

Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake

Fix -Wmissing-prototypes Remove unused function (acttab_free)

Add basename the filename with only filename (no path...)

Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value

Add "new" version of lempar.c (3 November 2009).

LEMPAR: fix trailing whitespace

LEMPAR: fix -Wunused-parameter

Change-Id: I2df7e39c9a6846de26743a981fb76aca423fe813
Reviewed-on: https://code.wireshark.org/review/6502
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 08:49:02 +00:00
Hannes Mezger dc6d68c624 opcua dissector: Fix display of status code in error message
Instead of just displaying the hex representation, use parseStatusCode which adds the textual representation of the status code

Change-Id: I43b9ff846ef48d727e77cfa247b9dcea7061bbab
Reviewed-on: https://code.wireshark.org/review/9441
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-02 08:48:44 +00:00
Alexis La Goutte b6c63e2553 Revert "SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error."
This reverts commit b591f07273.

Change-Id: I73e7b6a8ea37b1d5869e785633b74c89d7476b54
Reviewed-on: https://code.wireshark.org/review/9457
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-02 04:42:15 +00:00
cturney b591f07273 SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error.
In value string table "smb2_ioctl_vals[]" of packet-smb2.c

{0x0011C017, "FSCTL_PIPE_TRANSCEIVE" } was placed before
{0x00110018, "FSCTL_PIPE_WAIT"}

which causes "Extended value string 'smb2_ioctl_vals[]' forced to fall back
to linear search: entry , value 0x00110018 < previous entry, value
0x0011C017"

Change-Id: I99afe5aa12c031e90bb0bd4c8e8aadfffad0135d
Reviewed-on: https://code.wireshark.org/review/9449
Reviewed-by: Cal Turney <cturney@charter.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-02 04:41:41 +00:00
AndersBroman a66714bbad Fix Buffer overrun while writing to 'airpcap_dir_utf16': the writable
size is '520' bytes, but '1042' bytes might be written.

Change-Id: Ic88bc977011eff9ae3c2a4a5ba717e78dbb1171c
Reviewed-on: https://code.wireshark.org/review/9452
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 03:54:26 +00:00
AndersBroman ae5172f991 Try to fix warning C6340: Mismatch on sign: 'short' passed as _Param_(2) when some
unsigned type is required in call to 'printf'.

Change-Id: I3076454502e1c98ac225d33d520be5bbe5172c2a
Reviewed-on: https://code.wireshark.org/review/9451
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 03:53:59 +00:00
Patrick fa6fb76694 fixed spelling errors in Omron FINS packet dissector
Change-Id: I7cce1769d3e3c2c70d18e247b1e1040b05715c20
Reviewed-on: https://code.wireshark.org/review/9448
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 03:13:25 +00:00
Pascal Quantin 4a8f0e16f5 PMPROXY: avoid doing an invalid memory access when no token was found
Bug: 11320
Change-Id: Ie1fd3f1060e13cf742923aadebe375da4389422a
Reviewed-on: https://code.wireshark.org/review/9447
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-01 21:55:16 +00:00
Guy Harris c445570c49 Give instructions for installin Chcocolatey's Win flex-bison.
Fix a typo ("and and") while we're at it.

Change-Id: Ib68bbdf0b358f56b36cf53906f105c5ee6493ec4
Reviewed-on: https://code.wireshark.org/review/9446
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-01 20:14:38 +00:00
Pascal Quantin 3cd8c16886 NAS EPS: upgrade dissector to v12.9.0
Change-Id: Ic1fa22dee21b71b523ba5fcfc1ea1bf4c8029e6f
Reviewed-on: https://code.wireshark.org/review/9445
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-01 19:20:42 +00:00
Pascal Quantin 5d8cb033b2 3GPP NAS: upgrade dissector to v12.10.0
Change-Id: Ia89e49d098f86450245c73c4d06a4359a25e3d53
Reviewed-on: https://code.wireshark.org/review/9444
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-01 19:20:15 +00:00
Guy Harris b475b0e09d Sort smb2_ioctl_vals[] numerically.
Change-Id: I2d5fd1c640d3ac6fa60d84f2b8080eb7866b2641
Reviewed-on: https://code.wireshark.org/review/9443
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-01 18:13:23 +00:00
Gregor Beck 8a00a4b1ca add WERR_INVALID_STATE & WERR_TIMEOUT
Change-Id: Ie42cca588c9d5e02279083817382ac77f4ed74d6
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-on: https://code.wireshark.org/review/9439
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01 14:57:04 +00:00
Gregor Beck fa2c41fc58 add function guid_cmp() to compare guids
Change-Id: I6e34bcfb2205c1647e82dd396a13b0957532c4ae
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-on: https://code.wireshark.org/review/9438
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01 14:55:38 +00:00
Gregor Beck 7ee967c2b2 smb2: dissect FSCTL_PIPE_WAIT
Change-Id: Iec4fe90d792f745d8c754afc9b18ca6f7a708caa
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-on: https://code.wireshark.org/review/9437
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01 14:51:03 +00:00
Gerhard Gappmeier 9c7acde712 opcua dissector: Fix parsing of 7 byte numeric service NodeIds.
The service NodeIds of OPC UA are normally encoded as 4 byte numeric NodeId.
However, it is technically also possible to encode these as (less efficient) 7 byte numeric NodeId.
This kind of NodeId was already implemented, but wrong.
Since then no one ever used this kind of NodeId for service NodeIds.

Change-Id: I8654d969604e18bce8415931e455632e72d578ef
Reviewed-on: https://code.wireshark.org/review/9435
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01 11:13:10 +00:00
AndersBroman fbf0c34a4d Try to fix some warnings from Visual Studio Code Analysis.
Change-Id: Ibbbb89af23d0e37ea57a1079e311d8205d254ddd
Reviewed-on: https://code.wireshark.org/review/9434
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01 08:34:46 +00:00
Alexis La Goutte 8e87fad9d7 proto.c : fix indent
Change-Id: I74461666bcfc6e85a92409819e2c63811284e8f8
Reviewed-on: https://code.wireshark.org/review/9433
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01 08:23:10 +00:00
Guy Harris b107e93c88 Don't assume the source directory's path has no spaces in it.
Have SOURCES_TAP just contain the file names of the taps to run through
make-tap-reg.py, and pass $$PWD, properly quoted, as the "source directory"
argument to make-tap-reg.py.

Change-Id: I09382ccf9931db636aaeeb5d94c0ae029453ea9d
Reviewed-on: https://code.wireshark.org/review/9432
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-01 07:16:37 +00:00
Michael Mann b0b027d147 Explicitly check for DCE/RPC dissector name in the Decode As dialog because it doesn't have a specific subdissector table to invoke the DCE/RPC "Decode As" tab.
bug:10368
Change-Id: Iff94ddaf0c9f4d002be89dab480b6f9550ebd82f
Reviewed-on: https://code.wireshark.org/review/3575
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Cal Turney <cturney@charter.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-01 03:08:17 +00:00
Peter Hatina 986e34722b Disable overlay scrolling
Overlay scrolling causes problems when selecting eg. the last packet in Packet List. The last packet gets covered by the scollbar.

Change-Id: If23152721a457c7834d6727fc342ee0501a07302
Reviewed-on: https://code.wireshark.org/review/9169
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-06-30 20:57:08 +00:00
Guy Harris 98a7b1eeb8 Put quotes into xcopy command and note that it might need privileges.
The pathnames have spaces, so they must be quoted.

At least on my VM, I had to run it as Administrator.

Change-Id: I7600edbdbe3205c7f766cc651bd6b86340efa0ff
Reviewed-on: https://code.wireshark.org/review/9429
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-30 19:59:34 +00:00
Guy Harris 74338f5e5c Set the PHY value when providing our own metadata structure.
Bug: 11319
Change-Id: I8b746f7238729173b2ca23734e9f7fdbbe4f5110
Reviewed-on: https://code.wireshark.org/review/9232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-30 04:44:34 +00:00