aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-12-14epan: Make expert info summary text mandatoryStig Bjørlykke4-9/+7
This will make the code easier and removes the use of a generic "Expert Info" as name. Change-Id: I57ad2adb851726106ddc5009f3c6ca61721f647a Reviewed-on: https://code.wireshark.org/review/24792 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14Fix detection of Lua when there's no pkgconfig file.Jeff Morriss1-1/+12
Linking with liblua requires libdl on Linux; if the test link with liblua fails try including libdl. Fixes the problem reported in: https://www.wireshark.org/lists/wireshark-dev/201711/msg00102.html Change-Id: I8561f15f8d9adbab52d668d102811fb821b45034 Reviewed-on: https://code.wireshark.org/review/24678 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14ieee1905: Fix an incorrect flags dissection.Richard Sharpe1-1/+1
Change-Id: Iebb434875eac08aeabab6b9179a882817149012c Reviewed-on: https://code.wireshark.org/review/24820 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14ieee1905: Fix for a malformed packet with a Steering request.Richard Sharpe1-5/+27
If the mode bit is zero, we have to do different things than if it is 1. Change-Id: I5ed8bec1d350c02b736818cad5ab864748145686 Reviewed-on: https://code.wireshark.org/review/24775 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-12-14Register the UDS dissector by name.Guy Harris1-3/+4
See https://ask.wireshark.org/question/891/use-uds-dissector-inside-doip-dissector/ Change-Id: I608b4ffb90e65fd31e9f3e421f4c473f4e66bebd Reviewed-on: https://code.wireshark.org/review/24818 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-14Fix types.Guy Harris1-3/+3
ftell() returns a long; assign its value to a variable of that type. size_t is unsigned, so checking that it's >= 0 always succeeds. We can cast the variable's value to size_t once we've determined that it's non-negative; do so, to avoid other warnings. Change-Id: I0da6a220ce140ebf073df5f5bcd0c9526bf9c3c3 Reviewed-on: https://code.wireshark.org/review/24817 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-14Replace a comma with a semicolon, which it presumably was intended to be.Guy Harris1-1/+1
Change-Id: I308752a50b465a2772172c3500f6417a3ae19f11 Reviewed-on: https://code.wireshark.org/review/24816 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-14Qt: Fix a cast.Gerald Combs1-3/+1
Just use a const_cast instead of messing with compiler settings. Change-Id: I35d3498ac4c2817d02cbf11497a70f72b60b58bb Reviewed-on: https://code.wireshark.org/review/24815 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-13Add doc/README.build-system with CMake and autotools informationJoão Valverde1-0/+21
Currently more autotools than CMake. Change-Id: I167f0bdd49d70d72f6155a4d978975c034ce3b4a Reviewed-on: https://code.wireshark.org/review/24773 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2017-12-13Qt: Add ui, qrc and qm files to sourceRoland Knall1-0/+4
Autogen had the resulting effect, that IDE's no longer see those files as part of the source tree, and therefore do not show them. This fixes it. Change-Id: Ia1f259743ba5b63f5bc47da79afca90a9fabc07b Reviewed-on: https://code.wireshark.org/review/24794 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-13Add a model to use for Expert Info dialog.Michael Mann12-524/+1141
With the model (and proxy), the following features were added/fixed. 1. Expert severities can be filtered by type 2. Search filter expanded to include summary, protocol and column info 3. Expert info starts with all items collapsed. 4. Context menus for collapse/expand all Bug: 11753 Bug: 13831 Bug: 13842 Change-Id: I8e89c7be441e1f08e18915ef8805609e5c5d0bd1 Reviewed-on: https://code.wireshark.org/review/22458 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-13epan: Use expert info summary text as field nameStig Bjørlykke2-3/+7
Change the expert info registry to use summary text as field name instead of blurb to show the correct column header tooltip in custom columns. Preserve backward compability by not use empty summary text. Change-Id: Ibbaf142165be0d9f42d1e2476f39f8d251ea0593 Reviewed-on: https://code.wireshark.org/review/24788 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-13epan: Show a check mark in custom columns for FT_NONE typesStig Bjørlykke1-8/+1
This is valuable when adding a expert info field as custom column, but will also make sense for other FT_NONE types. Change-Id: Ib1a14c59a5450f2e713f190aecf3484586d116c4 Reviewed-on: https://code.wireshark.org/review/24787 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-13Fix RPM build: include the User Guide.Jeff Morriss1-0/+8
The User Guide has been installed by default since I9dd539c737cb3777dc1351707b9e45a3a6764aaa. Fixes problem reported in: https://www.wireshark.org/lists/wireshark-dev/201711/msg00162.html Change-Id: I462c7c18869e8df93785e1898364e248e897de50 Reviewed-on: https://code.wireshark.org/review/24679 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-12epan: Use check mark in protocol custom columnStig Bjørlykke1-2/+3
Change from the text "Yes" to a utf8 check mark to indicate the precense of a protocol in custom columns. Change-Id: I9510333fc12148bf1f61aa2ddea2c6d390a9491a Reviewed-on: https://code.wireshark.org/review/24783 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-12nfapi: Add missing expert info summaryStig Bjørlykke1-2/+2
Change-Id: Iba6330f9c7f27e82adfa967fe9b082920a5b0afa Reviewed-on: https://code.wireshark.org/review/24785 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-12fuzzer: add check for ftell return value (CID: 1426073).Dario Lombardo1-0/+1
Change-Id: I9b619c79433f267d87f6680eeb78a25daa169f4d Reviewed-on: https://code.wireshark.org/review/24778 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-12cmake: Remove -Wcomma for C++ when using Qt >= 5.10Stig Bjørlykke1-1/+12
The Qt team introduced a lot of "Possible misuse of comma operator here" warnings in qstring.h and qstringview.h in version 5.10. Now we need to fix the Qt source again. Change-Id: I948ba5a224d4dca1ebb6a758100c064d501c1d4a Reviewed-on: https://code.wireshark.org/review/24779 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-12qt: follow stream: fix crash during closeMartin Kaiser2-2/+10
The Follow Stream dialogue's button "Filter out this stream" filters out the stream's packets and then closes the Follow Stream dialogue. This may take a moment. If the user presses the Close button while the filtering is still running, the dialogue will be closed twice. This causes a crash which can be seen in ASAN builds. ==9485==ERROR: AddressSanitizer: SEGV on unknown address 0x60205e80001b (pc 0x7f923e672b8c sp 0x7fff73104600 bp 0x7fff73104600 T0) #0 0x7f923e672b8b in QCoreApplicationPrivate::sendThroughObjectEventFilters(QObject*, QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Core.so.5+0x2d9b8b) #1 0x7f924f46010b in QApplicationPrivate::notify_helper(QObject*, QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5+0x13f10b) #2 0x7f924f4655ff in QApplication::notify(QObject*, QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5+0x1445ff) #3 0x7f923e672dca in QCoreApplication::notifyInternal(QObject*, QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Core.so.5+0x2d9dca) #4 0x7f924f49ae54 in QWidgetPrivate::close_helper(QWidgetPrivate::CloseMode) (/usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5+0x179e54) #5 0x55f3e249582f in FollowStreamDialog::close() /media/sf_wireshark.git/ui/qt/follow_stream_dialog.cpp:327 #6 0x55f3e236e534 in FollowStreamDialog::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ui/qt/moc_follow_stream_dialog.cpp:155 ... SUMMARY: AddressSanitizer: SEGV ??:0 QCoreApplicationPrivate::sendThroughObjectEventFilters(QObject*, QEvent*) ==9485==ABORTING Ignore the Close button if we know that we'll be closing the dialogue shortly. Change-Id: Ibf1684fd75937e6b24fcb9ea62ae6acb038260e6 Reviewed-on: https://code.wireshark.org/review/24777 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-12ieee80211: Add additional ANQP IEs defined in IEEE802.11-2016.Richard Sharpe1-16/+66
Dissect the Venue URL element. More to come. Change-Id: I64330b3f90f9f6222df0fb00d3ea277f59424e98 Reviewed-on: https://code.wireshark.org/review/24776 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-11Revert "Move fill_in_local_interfaces to a thread."Gerald Combs8-103/+101
Calling scan_local_interfaces ends up calling fork via extcap. Doing so from a thread is ill-adivsed: https://rachelbythebay.com/w/2014/08/16/forkenv/ http://www.linuxprogrammingblog.com/threads-and-fork-think-twice-before-using-them This reverts commit 5b4894b7959f44e077f36194c490cbf402e1e659. Revert "fix compilation without pcap." as well. This reverts commit 51300b3c834a3877d567fb57ae78ec74ec8ba80d. Change-Id: Ic80582b52398c44af73c6d74dbb3216c4d1b37fc Reviewed-on: https://code.wireshark.org/review/24772 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-11SIP statistics: use flipped indices for tables when incrementing statsMartin Mathieson1-2/+2
Change-Id: I22ed38b1c2d7849e8930149fb39ee14fa198a6e1 Reviewed-on: https://code.wireshark.org/review/24771 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-12-11Fix make distcheckJoão Valverde4-32/+15
Change-Id: I0c5a31d423d19071dc6ed0a42b064271e5f63fd2 Reviewed-on: https://code.wireshark.org/review/24769 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-11fix compilation without pcap.Dario Lombardo4-9/+30
Fix a regression introduced by I09beab751c9c2917f017b6c082166d86ca693544. Change-Id: I57b971086470e836f4147500143c35494118e754 Reviewed-on: https://code.wireshark.org/review/24765 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-11[capture_info] Move capture_info_new_file() to capture.cAndersBroman3-131/+114
Change-Id: I9137af6461921d7553a8968743f61f2265424061 Reviewed-on: https://code.wireshark.org/review/24767 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-11[capture_info] Fold the code of capture_info_open() into ui/capture.cAndersBroman4-21/+16
Change-Id: Id302e88bed4da8b9b457049fb78b0bc7d7ffabe3 Reviewed-on: https://code.wireshark.org/review/24766 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-11gitlab-ci: restyle the gcc buildsDario Lombardo1-34/+30
The gcc builds now take the package from the official gcc ppa and use the ubuntu 16.04 docker image. The gcc docker image was shipped with a old Qt version that caused some errors. Change-Id: Ieefbda99cd0931ff3043de6caa4cccd163589759 Reviewed-on: https://code.wireshark.org/review/24736 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-12-11SIP statistics: fix problems with invalid itemsMartin Mathieson1-5/+9
Change-Id: Ide21489cad66e4bebaafe5ef813a000db2956a2e Reviewed-on: https://code.wireshark.org/review/24759 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-11Move fill_in_local_interfaces to a thread.Gerald Combs7-98/+79
Move fill_in_local_interfaces to a worker thread and start it as early as possible. Add a mutex for global_capture_opts. Change-Id: I09beab751c9c2917f017b6c082166d86ca693544 Reviewed-on: https://code.wireshark.org/review/24757 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-11Fix make distcheckJoão Valverde1-1/+0
Change-Id: Ie0e6ef4595be4f981b919ed609cc62a0595c3320 Reviewed-on: https://code.wireshark.org/review/24764 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-11Rewrite make-tap-reg.py in CJoão Valverde19-354/+320
Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a Reviewed-on: https://code.wireshark.org/review/24756 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-11NTP: fix authenticator dissection when padding is usedPascal Quantin1-3/+17
Bug: 14269 Change-Id: Ifdc9af7524a0566e33acbedff3757cff416ce8fb Reviewed-on: https://code.wireshark.org/review/24758 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-11NTP: fix parsing of multiple comma separated identifiersPascal Quantin1-2/+7
Bug: 14268 Change-Id: Id1d6040052d34d3f8bdfe49d20f4f3f8efbe001b Reviewed-on: https://code.wireshark.org/review/24755 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10[Automatic update for 2017-12-10]Gerald Combs10-86/+282
Update manuf, services enterprise numbers, translations, and other items. Change-Id: If3becbd6b66f0a7a49a80c4ff2dc2a2a6015fa16 Reviewed-on: https://code.wireshark.org/review/24752 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-10Win32: Add checks for _WIN32_WINNT and NTDDI_VERSION.Gerald Combs2-2/+13
Check to see if we're the source of truth for _WIN32_WINNT and NTDDI_VERSION in config.h and emit a compiler error if we aren't. Rearrange the #includes in ui/qt/data_printer.cpp so that config.h is included first. This fixes the following: 136>C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\config.h(411): warning C4005: 'NTDDI_VERSION': macro redefinition (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) [C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\ui\qt\qtui.vcxproj] C:\Program Files (x86)\Windows Kits\10\Include\10.0.15063.0\shared\sdkddkver.h(223): note: see previous definition of 'NTDDI_VERSION' (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) 136>C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\config.h(412): warning C4005: '_WIN32_WINNT': macro redefinition (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) [C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\ui\qt\qtui.vcxproj] C:\Program Files (x86)\Windows Kits\10\Include\10.0.15063.0\shared\sdkddkver.h(213): note: see previous definition of '_WIN32_WINNT' (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) Change-Id: I90886cb9450463d768d6529ccd678ca11508cde2 Reviewed-on: https://code.wireshark.org/review/24744 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-10Convert to using use SPDX identifier on wsutil directoryMichael Mann104-1366/+107
Change-Id: Id73e641499e75bc1afc1dea29682418156f461fe Reviewed-on: https://code.wireshark.org/review/24751 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10Add support for MongoDB OP_COMPRESSED packetsDerick Rethans1-48/+216
Bug: 14259 Change-Id: Iab6b494bebaa913267f94d41b7950b67dd406cb6 Reviewed-on: https://code.wireshark.org/review/24705 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10SOCKS: Display right version in pseudo headerUli Heilmeier1-14/+17
Use the previous recorded version as version and set field as generated. Bug: 14262 Change-Id: I0872ed826ccd8a5a1b75b071d810404d08ddc7b3 Reviewed-on: https://code.wireshark.org/review/24741 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10asterix: wrong presentation of fields I009/080 in CAT009.Marko Hrastovec1-3/+3
Fields I009/080 were wrongly represented for CAT009. 8 and 16 bit long fields were represented as 24 bit. Change-Id: I5bd1c1f006292f58d0290ced80dde22324cb4002 Reviewed-on: https://code.wireshark.org/review/24746 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10LLDP: Add 802.3 TLV Additional Ethernet Capabilities (Subtype 7)Anton Glukhov1-0/+59
Bug: 14267 Change-Id: I23eb82a2f9bb2d57952f71870cc0fc8f12f036df Signed-off-by: Anton Glukhov <anton.a.glukhov@gmail.com> Reviewed-on: https://code.wireshark.org/review/24735 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09make-dissectors: Indent and cleanup #includeJoão Valverde1-26/+32
Change-Id: I395d0c168a6ba2fc8fad85598e6355493b897a7a Reviewed-on: https://code.wireshark.org/review/24748 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09[MIPv6] Fixed IPv4 Home Address OptionMatej Tkac1-1/+0
Change-Id: I1c09ac390d5a40c92fc30cf114a3a13359b46eee Reviewed-on: https://code.wireshark.org/review/24738 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09Allow switching direction in LTE RLC graphMartin Mathieson6-25/+74
Change-Id: I1681089aebe7f00b2b84ece00c53a3bf8769d50b Reviewed-on: https://code.wireshark.org/review/24682 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-12-08Typing error correction for CAT002 settings selection.Marko Hrastovec1-1/+1
Two settings had the same string "Select the CAT001 version". One should be CAT002. Change-Id: Iee6204a1064af786338d1b53c7b983763b985a0c Reviewed-on: https://code.wireshark.org/review/24745 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-08oss-fuzzshark: fix compilation.Jakub Zawadzki1-1/+1
/src/wireshark/tools/oss-fuzzshark/fuzzshark.c:268:58: error: too few arguments to function call, expected 2, have 1 fuzz_handle = get_dissector_handle(FUZZ_DISSECTOR_TARGET); ~~~~~~~~~~~~~~~~~~~~ ^ /src/wireshark/tools/oss-fuzzshark/fuzzshark.c:133:1: note: 'get_dissector_handle' declared here Change-Id: I6c6e25017f0045b833d9249c9648145893fe0439 Reviewed-on: https://code.wireshark.org/review/24742 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-12-08Try to fix win32 build, add ui/packet_range.h include.Jakub Zawadzki1-0/+1
add ui/packet_range.h include to try to fix win32 build, compilation log: export_sslkeys.c 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2143: syntax error: missing ')' before '*' (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2081: 'packet_range_t': name in formal parameter list illegal (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2143: syntax error: missing '{' before '*' (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2059: syntax error: ')' (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] Change-Id: I58c77fdcbe3fe2e738601c4ef97596c7774704ec Reviewed-on: https://code.wireshark.org/review/24743 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-12-08[SCTP] Export of reassembled PDU uses wrong tvb.AndersBroman1-1/+1
Change-Id: I87ff6ef54dff5900a4a92406c87693fec6d9f692 Reviewed-on: https://code.wireshark.org/review/24737 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-08Have the frame_tvbuff.c routines not use the global cfile.Guy Harris91-104/+259
Have the routines that create them take a pointer to a struct packet_provider_data, store that in the tvbuff data, and use it to get the wtap from which packets are being read. While we're at it, don't include globals.h in any header files, and include it in source files iff the source file actually uses cfile. Add whatever includes that requires. Change-Id: I9f1ee391f951dc427ff62c80f67aa4877a37c229 Reviewed-on: https://code.wireshark.org/review/24733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08PROFINET: AdjustMAUType-Extension and CheckMAUTypeExtensionGizem Yurdagül1-2/+75
disections are added. According to specification, AdjustMAUTypeExtension is a subblock for adjusting MAUTypeExtension. CheckMAUTypeExtension is a subblock for checking MAUTypeExtension. Change-Id: Ia90f204887a2e9871bc71e24978ab0095cc0fe1f Reviewed-on: https://code.wireshark.org/review/24718 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Birol Capa <birol.capa@siemens.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-08Hand the packet provider functions to epan_new().Guy Harris12-119/+98
Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 09:04:38 +0000