Commit Graph

67332 Commits

Author SHA1 Message Date
Rémy Léone 54d92cd436 Refactor header ie dissection
- Change title of IE subtree
- extract dissect_802154_enhanced_beacon_filter
- Adding reference to the IEEE 802.15.4 standard
- fix Typo
- Explicit case of header termination

Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a
Reviewed-on: https://code.wireshark.org/review/21187
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-26 23:55:39 +00:00
Michael Mann 2c921eb83c Add proto_tree_add_item_ret_uint64
Just like proto_tree_add_item_ret_uint, but with 64-bit support

Change-Id: Ie0cbfda9e63bf21e85df2d674e391a6c0abe92f7
Reviewed-on: https://code.wireshark.org/review/21355
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-26 23:46:32 +00:00
Holger Hans Peter Freyther 24c9396559 m2ua: Export the m2ua dissector for lua scripts or similar
Make Dissector.get("m2ua"):call() work from within lua. So far
only m3ua, m2pa were exported to other dissectors.

Change-Id: I3350c3f4b2614fa07254306464c5fdffbadd4f3b
Reviewed-on: https://code.wireshark.org/review/21351
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-26 23:46:17 +00:00
Peter Wu 50a1f90398 FindPOD.cmake: look for pod2html.bat
Strawberryperl 5.24.1.1 installs "pod2man", "pod2man.bat" and
"pod2html.bat", but not "pod2html" so find_program cannot locate it.

Change-Id: Id52ee7e77bbbfc8c2fcc6ab66c498d4818f54bf8
Reviewed-on: https://code.wireshark.org/review/21350
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-26 21:52:34 +00:00
Peter Wu 35f620c533 cmake: make Cygwin optional
Cygwin is not needed if the documentation is not built (i.e. asciidoc,
docbook, xsltproc are not needed). Via Chocolatey the following packages
can be installed: git, winflexbison, strawberryperl.

Change-Id: Ib13d144321cf6d2ed5c3346a2ae271de983deada
Reviewed-on: https://code.wireshark.org/review/21316
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-26 21:52:15 +00:00
Peter Wu 46b105d513 Remove runlex.sh script, just run lex directly
This removes the need for sh (and Cygwin) on Windows to build Wireshark.

runlex.sh (added in commits 5be4499a and 517d6d57) was added because
older flex had quirks with its options (and the --header(-file) option
was not available). The minimum required flex version for reentrant
scanners (2.5.6) does not have these issues though, so remove the step.

Change-Id: I73c82bb329e2130481efca94809dc60b86dcbafe
Reviewed-on: https://code.wireshark.org/review/21315
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-26 21:51:18 +00:00
Peter Wu a8d9777161 cmake: remove dependency on sed
runlex.sh does not need sed anymore since v2.3.0rc0-2386-g64f83641ad.
Since building docs already depends on Perl, let's use Perl instead.

Change-Id: Id7e923e47001cfd32c8cef89960377026464f2ee
Reviewed-on: https://code.wireshark.org/review/21314
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-26 21:50:44 +00:00
Pascal Quantin 821a3466c6 ISUP: restore number indicators2 display like what was done in master-1.12
proto_tree_add_bitmask_list() should avoided as there is an interpreted field.

Bug: 13588
Change-Id: Iec6bf9bb4002123b6913fbee6287472aaf9bc00b
Reviewed-on: https://code.wireshark.org/review/21340
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>
2017-04-26 17:40:18 +00:00
Nicolas Bertin b9adb80cae ua3g: fixed "GET_PARAM_RESPONSE" message decoding (firmware version) and display
Change-Id: Ifb834d4895fda129878657468d21e3afc65cc5d3
Reviewed-on: https://code.wireshark.org/review/21339
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>
2017-04-26 10:41:22 +00:00
Nicolas BERTIN b8614451a2 ua3g: minor change in "UNSOLICITED" message decoding
Display "Not Applicable" instead of "Unknown" when the "Additional VTA Type" is not set (0),
which is the case with 2G and 3G terminals.

Change-Id: I178248e1de18176710fe978ebf90e99486e0ec7e
Reviewed-on: https://code.wireshark.org/review/21346
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-26 10:26:37 +00:00
Stig Bjørlykke 8012dcc712 Qt: Remove semicolon behind Q_UNUSED macro
Change-Id: Ief5f7bca5d110df8958307b58fc11bf740787dfd
Reviewed-on: https://code.wireshark.org/review/21349
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-26 06:30:21 +00:00
Stig Bjørlykke 81bad32f2c Qt: Remove semicolon behind Q_UNUSED macro, part 2
Change-Id: Id27a93c9a76b554bb2e98199d08d3d9604550889
Reviewed-on: https://code.wireshark.org/review/21348
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-26 06:27:37 +00:00
Stig Bjørlykke 30d98d1ea9 Qt: Remove semicolon behind Q_UNUSED macro
Change-Id: I75ff975216da23447b94bc513671ac269c52b7dc
Reviewed-on: https://code.wireshark.org/review/21342
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-26 06:11:32 +00:00
Stig Bjørlykke 3b5cfa9a77 Qt: Don't use _U_ for unused parameters in C++
Change-Id: If7acab5f438bb20b053fdcfef86b2f06765b5321
Reviewed-on: https://code.wireshark.org/review/21341
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-26 06:11:20 +00:00
Guy Harris f493bad8a2 Fix no-extcap build.
Change-Id: I9f01264bf5f0c28a4d871f6d983e9efed1c23259
Reviewed-on: https://code.wireshark.org/review/21347
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-26 04:48:42 +00:00
Dario Lombardo 0557fe1446 Qt: fix compilation without pcap.
Change-Id: Ia0fe79157f21fd0b1c0e5195c902ae07c55ca253
Reviewed-on: https://code.wireshark.org/review/21343
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-25 23:14:00 +00:00
Dario Lombardo 5b1a802c3e tools: improve debian-setup.
Change-Id: If547e0e1c821d3696eba0f303e8ab0769b1fabb4
Reviewed-on: https://code.wireshark.org/review/21245
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-04-25 21:07:23 +00:00
Martin Kaiser 451731f0c6 cmake: fix build without libxml2
When LibXml2 is not found, the LIBXML2_LIBRARIES is set to
"LIBXML2_LIBRARIES-NOTFOUND" rather than an empty string (as other
FindXxx modules do). This results in an error because the variable is
used in target_link_libraries (via epan_LIBS).

As workaround, explicitly clear the variable to ignore the cache entry.

Change-Id: I9e164f9c175b23559ac6bc37f9aca5f41df79d1f
Reviewed-on: https://code.wireshark.org/review/21321
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-25 15:15:33 +00:00
Peter Wu bfd1461ec8 ieee80211: fix stack-use-after-return
Bug: 13662
Change-Id: I26c53ecc78005b26908d74877814be22924848bc
Fixes: v1.11.3-rc1-2029-g4b8b83407a ("Support for IEEE 802.11ad")
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1268
Reviewed-on: https://code.wireshark.org/review/21333
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-25 13:51:52 +00:00
Stig Bjørlykke 907d05da84 print: Avoid shadowing a global variable
Change-Id: I9c04bc1d6fc5511d404987dd94eee342e0d75442
Reviewed-on: https://code.wireshark.org/review/21332
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-25 11:26:44 +00:00
S. Shapira 0d3da40fcd UMTS FP: Cosmetic fixes
Some fixes to comments and spaces

Change-Id: I0b1abf9619f2aab2b30120f4086d99332171b69d
Reviewed-on: https://code.wireshark.org/review/21334
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-25 10:53:46 +00:00
Stig Bjørlykke cd58e676bd etypes: Add ETHERTYPE_REALTEK
The definition was found in RTL8324 / RTL8326 datasheet.

Change-Id: Idaec6bb13ee1e321d6fe24c2a567bd9cd2a9d27d
Reviewed-on: https://code.wireshark.org/review/21331
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-25 09:52:55 +00:00
Stig Bjørlykke f9f2b84e65 Qt: Make text in SimpleDialog selectable by mouse
This makes it easier to copy error messages.

Change-Id: I39284d9b2d716336c6fc4b211e5346abcebf0aee
Reviewed-on: https://code.wireshark.org/review/21326
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-25 08:06:21 +00:00
Guy Harris 4ac4ab31a3 Don't crash if we have no BOOTP option preferences.
wmem_list_foreach() crashes if handed a null pointer, and saved_uat_opts
will be null if there are no BOOTP option preferences.  Don't do the
"free saved UAT options" stuff if there aren't any saved UAT options.

Bug: 13655
Change-Id: I88e64c6ebec88fc04a5adc0a85d378bbba49b383
Reviewed-on: https://code.wireshark.org/review/21329
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-25 07:46:02 +00:00
Stig Bjørlykke 77751c94f1 Qt: Add interface toolbar support
An extcap utility can provide configuration for controls to use in a
GUI interface toolbar.  This controls are bidirectional and can be
used to control the extcap utility while capturing.

This is useful in scenarios where configuration can be done based on
findings in the capture process, setting temporary values or give other
inputs without restarting current capture.

Todo:
- Add support for Windows

Change-Id: Ie15fa67f92eb27d8b73df6bb36f66b9a7d81932d
Reviewed-on: https://code.wireshark.org/review/19982
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-25 06:19:39 +00:00
S. Shapira cd55bd2925 UMTS FP: Improved MAC multiplexing detection
Previous detection was based on DCH ID 31 or 24 and specific TB Size.
New method checks if the 'Transport Format' looks like the commonly used format for DCCH over DCH or DCH ID 24 and specific TB size (To not break that special case which I'm not familiar with personally)

Change-Id: I59fe7772ec05f7cc15351ef78276085e25570461
Reviewed-on: https://code.wireshark.org/review/21304
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-25 05:09:49 +00:00
Nicolas BERTIN d3b2e44e91 ua3g: fixed/updated "unsolicited" and "version information" messages
Change-Id: If006c36a21556a8fb690401677e9ca62a594d82b
Reviewed-on: https://code.wireshark.org/review/21307
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: Anders Broman <a.broman58@gmail.com>
2017-04-25 05:09:18 +00:00
Pascal Quantin dcaad43e1f GSM SMS: add more lower layer info for reassembly and switch preference to on by default
Change-Id: I3faf15c326d14e246975094ad31431eba2404d8c
Ping-Bug: 13592
Reviewed-on: https://code.wireshark.org/review/21320
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>
2017-04-25 05:04:03 +00:00
Pascal Quantin cb089dd2ff GSM SMS: fix display of reassembled 8 bits SMS
Change-Id: I0052fb1f311f18180fbc7c6b8bd2fbf23215ad67
Reviewed-on: https://code.wireshark.org/review/21319
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-04-25 05:02:19 +00:00
Jakub Zawadzki 13fbdfc1ba fuzzshark: try to fix oss-build, remove oss-fuzzshark.c in old location.
Step #3: /src/wireshark/tools/oss-fuzzshark.c:190:2: warning: implicit declaration of function 'wtap_init' is invalid in C99 [-Wimplicit-function-declaration]
(https://oss-fuzz-build-logs.storage.googleapis.com/log-472514ce-1a41-4f14-8798-d45084212a65.txt)

Change-Id: I47715bdf55c20124a80da51d3c8812db1d8d94cf
Reviewed-on: https://code.wireshark.org/review/21317
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2017-04-24 20:50:53 +00:00
Michael Mann 6cbea5c01c Convert BOOTP options into a dissector table.
This allows for much easier addition or overriding of options and use of Decode As.
This includes adding heuristic dissector tables for vendor specific options.

Change-Id: If52c00bbc23d89386ba3e777600f665609856de0
Reviewed-on: https://code.wireshark.org/review/21297
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-24 20:27:03 +00:00
Pascal Quantin 4b2ee36743 GSM SMS: optionally use GSM-MAP info to perform reassembly (off by default)
Change-Id: I62c7a04e62167bd2d68d861f1d8d854f3159b159
Ping-Bug: 13592
Reviewed-on: https://code.wireshark.org/review/21306
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-04-24 18:59:36 +00:00
Jakub Zawadzki 9785aed5b6 oss-fuzzshark: Copy to separate directory, add build script.
(oss-fuzz part https://github.com/google/oss-fuzz/pull/544)

Change-Id: I54cf7a7b1aaa49582b5fff8bd034187aa6a9bdec
Reviewed-on: https://code.wireshark.org/review/21302
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-04-24 16:50:26 +00:00
Adrian Simionov 20d1db6439 [docsis->bpkm-attr] Updated Attribute 16 Error Codes
Change-Id: If9156b4a73e7db006daf4ab4e278379f0e39905f
Reviewed-on: https://code.wireshark.org/review/21313
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-24 16:46:58 +00:00
AndersBroman 4dde22c416 [MIP6] Fix length calculation, APN name and PCO.
Change-Id: I2a26ef0bbde07071f72c19d9465adf02cb177816
Reviewed-on: https://code.wireshark.org/review/21311
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-24 15:08:27 +00:00
Alexis La Goutte 9ccba0e605 Revert "Make the set of static routines match that in the current tip SQLite."
This reverts commit 96c72df2df.

Generated a lot of warning (-Wmissing-prototypes)
and i try to kept a sync branch on https://github.com/alagoutte/sqlite/tree/wireshark

Change-Id: I42252a6e736f96783a9fa9805b84e525fe11726e
Reviewed-on: https://code.wireshark.org/review/21182
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>
2017-04-24 07:30:05 +00:00
Uli Heilmeier 860abb09e7 TFSHARK: Fix clobbing warning for variable success
Without setting the success variable as volatile my build fails
with warning "error: variable success might be clobbered by 'longjmp' or 'vfork'"

Change-Id: Ic7d4a9b8be4bf9211127dcf5a6bb4bef8bbcd7a9
Reviewed-on: https://code.wireshark.org/review/21310
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-24 06:26:23 +00:00
Guy Harris e52c95c6c8 Move UI-only stuff out of libwireshark.
Packet ranges are used only in the UI; move the packet range stuff into
libui.

Don't pass a print_args_t structure to libwireshark packet-printing
routines, just pass the few parameters they need.  Move the declaration
of print_args_t into file.h.

Change-Id: Icff5991eea7d7d56f33b4716105895263d275bcf
Reviewed-on: https://code.wireshark.org/review/21308
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-24 03:38:21 +00:00
Guy Harris 751e078d2b Print first-pass read errors at the end.
That way, they don't, for example, get lost as a result of being
scrolled off the screen by output from the second pass.

Also, do the post-processing of output regardless of whether we got read
errors or not, and fix a code error hidden by a call to tshark_debug().

Change-Id: I389c7c794f4dd5fda6e4c50ce480802c92701866
Reviewed-on: https://code.wireshark.org/review/21305
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-23 20:18:46 +00:00
Jakub Zawadzki e2f76f991c tshark: make success volatile.
/home/wireshark/builders/ubuntu-x86-64-petri-dish/ubuntu-x86-64-petri-dish/build/tshark.c: In function ‘main’:
/home/wireshark/builders/ubuntu-x86-64-petri-dish/ubuntu-x86-64-petri-dish/build/tshark.c:653:12:
error: variable ‘success’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]

Change-Id: I793962c71b0ebfafc7c09b1d865cfa774456bb3a
Reviewed-on: https://code.wireshark.org/review/21303
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-23 19:08:28 +00:00
sswsdev 5ac71132e2 UMTS FP: Fix bug in heuristic dissectors
The code was not allowing UDP port types, should ONLY allowed UDP ports.

Change-Id: Ida5467313cbc24fcbac7cd432fb4a018cc00bdef
Reviewed-on: https://code.wireshark.org/review/21301
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-04-23 16:33:31 +00:00
Gerald Combs 69762f5d1c [Automatic update for 2017-04-23]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: If8e6efa61c4c2808c51c585b0c61fd76a321c3fd
Reviewed-on: https://code.wireshark.org/review/21298
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-23 15:17:54 +00:00
Guy Harris dc9127ddff Rename read{_cap}_file() to process{_cap+_file().
They might read the file once or twice, but the key is that they (and
what they call) are doing the work of processing the file's contents.

Change-Id: I2df6257c55ff5ace944f1a1db5e2aec456ed2038
Reviewed-on: https://code.wireshark.org/review/21293
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-23 08:29:55 +00:00
Guy Harris e9f5e045f7 Just have read_cap_file()/read_file() return a success/failure indication.
No need to report the precise error code - it's already reported the
error.

Change-Id: Ib52daf094253deac2a10d16793ebf0f42581afd6
Reviewed-on: https://code.wireshark.org/review/21292
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-23 08:21:26 +00:00
Uli Heilmeier 045d1dc9f1 HTTP: Add status code description
This commit adds the IANA status code description to the tree.

Furthermore it updates the registered status codes
s. https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml

Change-Id: I6ec57569b784a137b57532a092c8781dec545039
Reviewed-on: https://code.wireshark.org/review/21162
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>
2017-04-23 06:18:00 +00:00
Peter Wu 7eab596c08 slsk: fix infinite loop
If check_slsk_format reports that the buffer does not contain the
expected data, do not try to find more items (break out of the loop).

In one case, an infinite loop would occur because the index variable was
not incremented when the check fails. In all other cases, it would
perform up to 2^32 calls to check_slsk_format per loop (with the same
offset parameter, so no exception is triggered).

Change-Id: I4b7fa10a36fee2551fa46831bcecd6bcd9f342d1
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1200
Bug: 13631
Reviewed-on: https://code.wireshark.org/review/21284
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>
2017-04-23 06:13:54 +00:00
Guy Harris a4eb68be97 Rename some routines to better reflect what they do.
In TShark, rename load_cap_file() to read_cap_file(); this is TShark,
not Wireshark, so you're not "loading" a file to be manipulated through
the GUI.

In TFShark, rename it to "read_file()"; not only are we not loading it,
it's not even necessarily a capture file.

Change-Id: I122b46ecd8cb7de9c1e1c249ba6c08fdeb93f7e2
Reviewed-on: https://code.wireshark.org/review/21291
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-23 05:22:38 +00:00
Martin Mathieson 5e74b318fd Snort: restore timestamp before showing alert
Change-Id: I4772c9c46b7a79a7139229bcb43ee6c84109a26b
Reviewed-on: https://code.wireshark.org/review/21289
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-23 03:32:07 +00:00
Björn Ruytenberg 6fdf8eb5a9 DOF: Fix buffer overflow (read)
Perform sanity check on buffer length parsed from data. Check buffer
size before reading value.

Change-Id: I8beaf8860b39426d79867b0dd2221e57e32da8e0
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1151
Bug: 13608
Reviewed-on: https://code.wireshark.org/review/21287
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-23 00:29:50 +00:00
Alexis La Goutte f42b2a531e aruba (PAPI): fix conflicting entry in its value_string
Field 'Destination Port' (papi.hdr.dest.port) has a conflicting entry in its value_string: 8999 is at indices 143 (LAST_SERVICE) and 144 (MESSAGE_HANDLER))

Field 'Source Port' (papi.hdr.src.port) has a conflicting entry in its value_string: 8999 is at indices 143 (LAST_SERVICE) and 144 (MESSAGE_HANDLER))

Check from Services.pm and same value for both...

Change-Id: I8ff56bfbee525e894235a9aea62e0f1d2a9b0ebc
Reviewed-on: https://code.wireshark.org/review/21191
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-22 22:48:35 +00:00