aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-12-15[ISAKMP] Added support for new Notify EMERGENCY_CALL_NUMBERS PayloadMatej Tkac1-7/+144
In accordance with the latest 3GPP TS 24.302 (Section 8.2.9.8) 3GPP TS 24.008 (Section 10.5.3.13) Bug: 14273 Change-Id: Ib5a24fa33633764f6bfb034250c309c1f4af9914 Reviewed-on: https://code.wireshark.org/review/24793 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-15epan: Add default type handling for custom columnStig Bjørlykke1-23/+8
Add default type handling in proto_custom_set() to prevent crashes when trying to use FT_IPXNET, FT_AX25 or FT_VINES items as custom columns. This will also work as a safeguard when adding new types. Change-Id: Iaf3b48aec72f0e5c10332b0e6d5f7221b0196e15 Reviewed-on: https://code.wireshark.org/review/24836 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-15Qt: Switch ProtoTree to a treeview+model.Gerald Combs18-575/+864
Add a ProtoTreeModel and use it in ProtoTree. This should make the UI more responsive when we have lots of items in the tree. Change-Id: Id26e6bcff84663867a8da17fd9ae86ff639b633f Reviewed-on: https://code.wireshark.org/review/24774 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-15ieee80211: Add handling of the ANQP Neighbor Report.Richard Sharpe1-2/+16
Change-Id: I857cdcc3a15cd01c3b5cc7e31be043048ef5f1ed Reviewed-on: https://code.wireshark.org/review/24784 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-15epan: Whitespace fixesStig Bjørlykke1-65/+50
Change-Id: I859c7bf5cfaf23b46d2cda7ff9c7e1ddd164832a Reviewed-on: https://code.wireshark.org/review/24838 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-15Qt: Fix translating some textsStig Bjørlykke2-6/+6
Change-Id: I8267bfd96efe9d9d086913ff418a74a68e63b8da Reviewed-on: https://code.wireshark.org/review/24837 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-15debian/rules: Fix typoJoão Valverde1-1/+1
Change-Id: I3fea8e42af2f51700f283cbcdc45ac3420979cd9 Reviewed-on: https://code.wireshark.org/review/24835 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-14Remove a plugin_if_gui_cb type conversion.Gerald Combs5-33/+21
We always pass a GHashTable * to plugin_if_gui_cb so don't cast it to a gconstpointer. This should fix the following and related warnings: main_window.cpp: In function ‘void plugin_if_mainwindow_apply_filter(gconstpointer)’: main_window.cpp:121:44: warning: cast from type ‘gconstpointer {aka const void*}’ to type ‘GHashTable* {aka _GHashTable*}’ casts away qualifiers [-Wcast-qual] GHashTable * data_set = (GHashTable *) user_data; Fix another const warning while we're here. Change-Id: Ia9225188bfb913feb4fef4369f10fd5791fc8dc9 Reviewed-on: https://code.wireshark.org/review/24830 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-14Fix registration of wiretap pluginsPascal Quantin1-1/+1
Change-Id: I1277870cab348feda7e23cffb277410bd4b10a0e Reviewed-on: https://code.wireshark.org/review/24832 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-14Add new dissector callback signature with data pointerJoão Valverde2-7/+40
This is useful to implement language bindings (Lua, Python, etc) and good practice in general. Non-breaking change to the API. Change-Id: I8d16c14880e5aa53212af8418c468a6ec3aa8954 Reviewed-on: https://code.wireshark.org/review/24814 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-14Add new plugin type for libwiresharkJoão Valverde4-8/+88
Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-14Qt: Constify a variable.Gerald Combs1-1/+1
Change-Id: Icb3ce93d24ffbdf4ac6d3b70e7baa1f991169ac3 Reviewed-on: https://code.wireshark.org/review/24823 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-14Qt: Add and use qUtf8Printable.Gerald Combs6-34/+46
Qt 5.4 introduced qUtf8Printable, a convenience macro for converting QString to a UTF-8 const char *. Add a compatibility definition and start using it. Change-Id: I3cf88611b1ed1a34082cb2ba82394954e2e6c461 Reviewed-on: https://code.wireshark.org/review/24828 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-14Register the MongoDB dissector as SSL capable.Derick Rethans1-0/+2
Bug: 14275 Change-Id: Ia0d8d0b333f69e59ba54b0d788587484dfae950e Reviewed-on: https://code.wireshark.org/review/24827 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14fp_mux: fix 'data' was marked unused but was used [-Wused-but-marked-unused]Alexis La Goutte1-1/+1
Change-Id: Ieac1b7a19d50c35d565421e1012dfb4001b6dd44 Reviewed-on: https://code.wireshark.org/review/24826 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14ciscodump(extcap): fix 'packet' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Wused-but-marked-unused] Change-Id: I04a52c37404fe6a91740b766de1482376d7128fa Reviewed-on: https://code.wireshark.org/review/24825 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14firewall_rules(ui): fix 'ptype' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Wused-but-marked-unused] Change-Id: Iadc3717cdbdbde8d863ed822ef3ad29256e099f0 Reviewed-on: https://code.wireshark.org/review/24824 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14[ISUP] Update value strings from specification amendment.AndersBroman1-5/+13
Change-Id: Ib3dff9c438b9adbec4533f1a66f1bf07f51dbd07 Reviewed-on: https://code.wireshark.org/review/24821 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14Qt: Add QtCreator generated files to gitignoreRoland Knall1-0/+1
Change-Id: Id3ba4eede12de954bdc34d906abf2a84dc3e1cdd Reviewed-on: https://code.wireshark.org/review/24822 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-14Refactor plugin registration and loadingJoão Valverde75-937/+561
Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-14Add dissector for ActiveMQ Artemis Core ProtocolPavel Moravec4-0/+157
So far decode just packet headers Change-Id: I7a01f3c83b97882f4c669122ad94b2bdab0ab251 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Reviewed-on: https://code.wireshark.org/review/24583 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
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>