summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2016-12-20Qt+Win32: Make software updates more friendly.Gerald Combs8-10/+148
Add WinSparkle can_shutdown and shutdown_request callbacks which are called prior to running the installer. Reject updates when we have unsaved information. Add notes about possible improvements. Ping-Bug: 9687 Ping-Bug: 12989 Change-Id: Ia126244b311417aa3105ea8136f186adc2745445 Reviewed-on: https://code.wireshark.org/review/19244 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-20Gtk: don't use GTimeZone/GDateTimeDario Lombardo1-5/+5
Use struct tm instead. Change-Id: I678797b93062305849875b33867faa52379c3dcb Reviewed-on: https://code.wireshark.org/review/19356 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>
2016-12-20extcap: set help page for all extcaps.Dario Lombardo1-1/+1
They've been set to the manpage of the local filesystem. Ping-Bug: 13218 Change-Id: Iacd5d2ba7ae39ee1718b59747c245d1c07785e8f Reviewed-on: https://code.wireshark.org/review/19179 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-12-19tap-rtp-common.c: set STAT_FLAG_WRONG_TIMESTAMP when timestamp sequence is wrongAlexis La Goutte1-7/+10
Set STAT_FLAG_WRONG_TIMESTAMP for RTP sequence when newer packet has lower timestamp than previous one. Change-Id: Ib18830eea33ddb3dbbdf3beba279131c0fc5a948 Reviewed-on: https://code.wireshark.org/review/19292 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>
2016-12-19RTP analyzis dialog/Qt: fix - when dialog is called from RTP stream dialog, ↵Jiri Novak1-0/+1
G (select packet) signal is not passed to parent dialog Problem is in 2.0 and master. It is probably in 2.2 too. Change-Id: Iaa8adea788dcd5da7cff32d56d483a1e7d52d226 Reviewed-on: https://code.wireshark.org/review/19340 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-19Qt: minor updates to TCP stream dialog and throughput moving averageKevin Hogan3-18/+175
The time-based moving average code should use a constant window size as the denominator when calculating throughput. Added QDoubleSpinbox widget to choose the time-based moving average size. Also added (optional) ability to select ACK (reverse) packets as well as data packets when clicking on the base graph. (useful, for example, when examining SACK or DSACK packets) Added CheckBox widget (with tooltip) for user to choose ACK selection Change-Id: Ib3ba4f9be9e30aa8f3088b0b2d48b4ca214f7cc3 Reviewed-on: https://code.wireshark.org/review/19108 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-18Call Flow: Fix - Duration of segment of RTP flow is wrong in call flow.Jiri Novak1-0/+1
But is observed in 2.0 and later branches. Change-Id: I46fcbb33824d30bac1999e1b61d9c249972d17f0 Reviewed-on: https://code.wireshark.org/review/19316 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-18[Automatic update for 2016-12-18]Gerald Combs7-738/+1331
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3c720c31d7ddfbef001bda47eca49ab4804e8e74 Reviewed-on: https://code.wireshark.org/review/19332 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-18SIP/SDP, RTP: Dissectors shows information about ED-137 related states of ↵Jiri Novak2-2/+20
radio in info column/VoIP call flow Based on EUROCAE ED-137B specification: ED-137B, Part 1: RADIO, INTEROPERABILITY STANDARDS FOR VOIP ATM COMPONENTS https://boutique.eurocae.net/eshop/catalog/index.php Bug: 13252 Change-Id: Ifab1aaf47e3405fcd46309167237f11ce2d7e2ff Reviewed-on: https://code.wireshark.org/review/19302 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-16Rename packet-range.[ch] to packet_range.[ch]Michael Mann3-3/+3
The check*.pl scripts presume that files with the prefix "packet-" are dissector files and therefore have different rules than other files. Rather than trying to clarify that more with additional directory information, just make any non-dissector file with "packet-" filename prefix conform if it fails a "dissector specific" check from the scripts. Change-Id: I7cb52e1fad4ea62320492bb690904260f958aeb4 Reviewed-on: https://code.wireshark.org/review/19304 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-15Make some items that don't need to be size_t guint.Guy Harris2-2/+2
Those sizes are limited by the packet sizes we support, and we only support a maximum packet size of 2^32. This squelches some compiler warnings. Remove some casts that this renders unnecessary. Change-Id: Id9a7bcf8c2ce30bbed7be6c0e28deb9cf38002e0 Reviewed-on: https://code.wireshark.org/review/19279 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-15VoIP Calls/Flow Sequence: Fix of showing nodes from previous callJiri Novak3-6/+21
When VoIP Calls/Flow Sequence generates list of nodes to show (nodes above flow), it do not clear the list from last call. As consequence of it, when second call is between hosts than first call, you see nodes which are not involved in call. Change-Id: I80f9acb09e6aa71b3a32bb6eacaeb5b4bb13b332 Reviewed-on: https://code.wireshark.org/review/19267 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>
2016-12-15Save RTP audio to file: RTP Stream Analysis dialog allows save audio for non ↵Jiri Novak5-306/+511
G.711 codecs and mixed codecs - spaghetti code for save was split into separate functions - code saves G.711 only, all other codecs are saved as silence with correct duration - code is ready to include other codecs - code supports 8000 Hz sampling rate only, other rates are rejected with warning - bidirectional stream (forward and reverse) creates stereo .au file - output is based on timestamps in RTP streams - save operation is slower than before because it is set of seek() - one per each codec sample - code allows align of save audio: - as it is - each stream is saved from its beginning, no aling - to start of each other - later stream is prepended with silence - align saved audio to beginning of capture file - each stream is prepended with silence - save to raw works correctly now - only payload is saved - old code was inserting G.711 silence time to time to raw data Bug: 13242 Change-Id: I74d02a1cc1c75acf9ffe930d078c00a0555cbfb6 Reviewed-on: https://code.wireshark.org/review/19245 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>
2016-12-14RTP Stream Analysis: save Audio allows any filename extensionJiri Novak1-4/+8
Format of file selected by user is derived from save dialog format selection, not from filename as before. Bug: 13240 Change-Id: Id6e159d97e4f26c25b3d2d98d43041d8617cc737 Reviewed-on: https://code.wireshark.org/review/19240 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>
2016-12-14RTP Stream Analysis dialog: dialog shows when forward/reverse stream startsJiri Novak3-1/+15
Dialog shows time (relative to capture start) and packet number when forward and reverse stream starts. It shows difference in such values on bottom of dialog too. Bug: 13239 Change-Id: If807b8a56723df17ed131b1aac053cf8f985bb7b Reviewed-on: https://code.wireshark.org/review/19239 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>
2016-12-13Qt: Optionally restore our selected packet when thawing.Gerald Combs3-7/+31
Stash the current row when we freeze the packet list. Make it possible to restore it when thawing. Do so when the layout changes and when we move a column. Change-Id: I44cfb8bafcd4d49a46e1c89bf47aecf5ac139773 Reviewed-on: https://code.wireshark.org/review/19222 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-13rtp_analysis_dialog.cpp: RTP Stream Analysis dialog shows same SSRC for ↵Jiri Novak1-1/+1
forward and reverse stream Same SSRC is shown because of typo in variable name for reverse stream. Bug: 13236 Change-Id: Idcba4d83c7b4358cd8ebf1ee5c5b5bde2fc2e48b Reviewed-on: https://code.wireshark.org/review/19238 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-13[RTP Analysis] calculate BW correctly whem IPv6 is used.AndersBroman1-4/+20
Change-Id: Ia53efa57042d199673a77c59491215c0e99c9e84 Reviewed-on: https://code.wireshark.org/review/19235 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-12-13Update to WinSparkle 0.5.3.Gerald Combs1-0/+9
Update our WinSparkle package to 0.5.3. This fixes a file deletion bug. Note that WinSparkle now supports application shutdown callbacks, which should let us fix bugs 9687 and 12989. Bug: 13217 Change-Id: I4b5f325c6dc251ce167f7bd344bbf3ca5ad3fe14 Reviewed-on: https://code.wireshark.org/review/19230 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-12Remove some GtkCList comments and code.Gerald Combs1-1/+1
Remove some comments and hopefully-no-longer-necessary code specific to GtkCList. Change-Id: Ib62387f87e662798afba282cf95cbd215d60075e Reviewed-on: https://code.wireshark.org/review/19227 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-12rtp_player_dialog.cpp: fix usage of unsupported method ↵Jiri Novak1-0/+7
QComboBox::setCurrentText with Qt4.x QComboBox::setCurrentText() method is available in Qt5.x. Older versions code won't compile with it. Bug: 13235 Change-Id: Ia2e2713fefe0f2be01a0b77ff1ac39c9162fd0d1 Reviewed-on: https://code.wireshark.org/review/19219 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-12Move the declaration of packet_list_select_last_row() to ui/gtk/packet_list.h.Guy Harris4-12/+2
It's GTK+-only, so it shouldn't be in ui/ui_util.h. Get rid of the unused Qt packet list implementation of it. Change-Id: Ia9f8fe2209939dff5244e6948c36f29509340f68 Reviewed-on: https://code.wireshark.org/review/19226 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-12Get rid of some GTK+-only routines in file.c.Guy Harris1-2/+2
Just directly call the packet_list_select_ routine from the GTK+ code. Change-Id: I9146fb968c407d6186b146a86aa34678765f7352 Reviewed-on: https://code.wireshark.org/review/19225 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-12Mark routines GTK+ only.Gerald Combs2-1/+2
Mark packet_list_select_last_row and cf_goto_bottom_frame GTK+ only. Change-Id: I158814c2fa8c5fa8021b7156dded0945535c978a Reviewed-on: https://code.wireshark.org/review/19223 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-12Do not set Qt Window focus when highlighting rowsD. Ulis1-2/+0
Bug: 11890 Change-Id: I372f096c1ac0e483bf49cf95831e3df43621a642 Reviewed-on: https://code.wireshark.org/review/19209 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-11[Automatic update for 2016-12-11]Gerald Combs7-490/+616
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie1a890ea3d5cfab844bc486806303e0ea4417ec3 Reviewed-on: https://code.wireshark.org/review/19203 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-10Qt: Avoid infinite recursion in ExtcapArgument::loadValuesStig Bjørlykke1-2/+4
If configuring a extcap "value" sentence with {value=} then loadValues() must not run in a infinite recursion trying to find it's children. Change-Id: Ic2577b31d9312e8f6a099c4fe7c0672e801dbc89 Reviewed-on: https://code.wireshark.org/review/19192 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-12-09ui: move filesystem code to wsutil/filesystem.cDario Lombardo3-37/+2
This function can be used by code outside ui (eg. extcap). Ping-Bug: 13218 Change-Id: Ic11f7acebefeaf777692df044ebff9b1bc387aa3 Reviewed-on: https://code.wireshark.org/review/19178 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-09extcap: add new option type (timestamp).Dario Lombardo5-1/+127
Bug: 12787 Change-Id: I941833c55fb607c8af2ef832082af58d7b94e965 Reviewed-on: https://code.wireshark.org/review/18721 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-08Qt: Fix currentOutputDeviceName() without QtMultimediaMichal Labedzki1-0/+2
Fix build error: ui/qt/moc_rtp_player_dialog.cxx:87:76: error: ‘currentOutputDeviceName’ was not declared in this scope case 0: *reinterpret_cast< QString*>(_v) = currentOutputDeviceName(); break; Change-Id: I065862540e775c3e965cb5d3ae4c53bd8d505bdd Reviewed-on: https://code.wireshark.org/review/19142 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-07Qt: don't append a second extension to save file namesРоман Донченко1-2/+1
When checking if the file already has one of the possible extensions, MainWindow::fileAddExtension reuses file_suffix between iterations and appends to it each time, so it ends up checking for the wrong suffix for all extensions except the first one. Scope file_suffix to the for loop to fix that. Change-Id: Idbc5a619a4793d8c477bfd88305cdb44ea844e13 Reviewed-on: https://code.wireshark.org/review/19123 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-07Qt: Fixup the currentOutputDeviceName Q_PROPERTY.Gerald Combs2-3/+3
The CONSTANT attribute indicates that the same value will be returned every time. That isn't the case here so remove it. Change-Id: Ie7451e6aabcb4fa1a6960762d96ad190f32b3d7a Reviewed-on: https://code.wireshark.org/review/19130 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-06Qt: Make the RTP player output device selectable.Gerald Combs5-11/+127
Add a combobox for selecting the output device and populate it with our available devices. Let the user know if our output format isn't supported. Ping-Bug: 13105 Change-Id: I299c7d0f191bb66d93896338036000e2c377781f Reviewed-on: https://code.wireshark.org/review/19046 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-06codecs: Add support for G.722 and G.726Peter Wu3-4/+16
Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-05Clean up initialization code for programs.Guy Harris1-2/+3
Make the init_progfile_dir() call unconditionally, even if plugins aren't supported, as that doesn't necessarily mean nobody uses the directory containing the executable. Report the error the same way in all programs, and free the error string after we're finished with it. Make the error - and the comment before the code - reflect what init_progfile_dir() is actually doing (the goal is to get the full pathname of the directory *containing* the executable; that's generally done by getting the pathname of the executable and stripping off the name of the executable, but that's won't necessarily always be the case). Also note for TShark that we won't be able to capture traffic, just as we do for Wireshark (if we don't have the pathname of the program file, we don't have a pathname to use to find dumpcap). Have the plugin scanner just fail silently if we weren't able to get the plugin directory path, so we don't have to worry about calling it if init_progfile_dir() fails. Clean up white space while we're at it. Change-Id: I8e580c719aab6fbf74a764bf6629962394fff7c8 Reviewed-on: https://code.wireshark.org/review/19076 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Have a routine to do all the work of initializing libwiretap.Guy Harris1-2/+1
Have programs that use libwiretap call that routine rather than separately calling some or all of init_open_routines(), wtap_register_plugin_types(), and wtap_opttypes_initialize(). Also don't have routines internal to libwiretap call those. Yes, this means doing some initialization work when it isn't necessary, but scattering on-demand calls throughout the code is a great way to forget to make those calls. Change-Id: I5828e1c5591c9d94fbb3eb0a0e54591e8fc61710 Reviewed-on: https://code.wireshark.org/review/19069 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Show codec information in About dialogPeter Wu1-0/+2
Show codec libraries in About dialog, this should give the user a clue of what codecs are available. SBC is already supported, Spandsp (for G.722/G.726) is work in progress. Change-Id: Iebc4d9c9fae619a442e06c8afc780a420aa3971b Reviewed-on: https://code.wireshark.org/review/18978 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-04codecs: allow it to be used without pluginsPeter Wu1-1/+1
Not all codecs require the plugin infrastructure. For example, G.711U/A is a built-in codec. Allow such functionality to be registered even if plugin support is disabled. Change-Id: I2505cc9955e7953268ec0739531278921f70a771 Reviewed-on: https://code.wireshark.org/review/18977 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-04[Automatic update for 2016-12-04]Gerald Combs7-3813/+3734
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icad3ffb6cbd570b0b8a2c650d3c11a3c9bed536f Reviewed-on: https://code.wireshark.org/review/19066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-04Qt: clear Export Objects list on retappingPeter Wu1-0/+3
The tap reset callback should not just invoke the reset callback of the dissector, but also clear the previous list of objects in the dialog. Otherwise duplicate entries will be created every time retapping occurs (e.g. on changing the display filter). Bug: 12230 Change-Id: I75f25db0652dcc9c0ac59ab0e536c06874aedb9c Reviewed-on: https://code.wireshark.org/review/19055 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: Peter Wu <peter@lekensteyn.nl>
2016-12-04Have separate merge APIs for regular file/temporary file/standard output.Guy Harris3-11/+8
This is similar to what we have for opening a dump file - one API that uses the file name as specified, one that creates a temporary file and provides the file name, and one that uses the standard output. All of those APIs handle closing the output file. Change-Id: I56beea7be347402773460b9148ab31a8f8bc51e1 Reviewed-on: https://code.wireshark.org/review/19059 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02Include config.h at the very beginning of all Flex scanners.Guy Harris1-2/+5
That way, if we #define anything for large file support, that's done before we include any system header files that either depend on that definition or that define it themselves if it's not already defined. Change-Id: I9b07344151103be337899dead44d6960715d6813 Reviewed-on: https://code.wireshark.org/review/19035 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>
2016-12-02Put tap-exportobject.h into the release tarball.Guy Harris1-0/+1
Change-Id: I5c103c5b513c32c5de0ea90956f9049fd6b0edec Reviewed-on: https://code.wireshark.org/review/19022 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02Enable exporting objects with tsharkMoshe Kaplan26-1260/+836
A new "--export-object <protocol>,<destdir>" option is added to tshark. This required refactoring Export Object behavior in all GUIs to give the export object handling to the dissector, rather than the ui layer. Included in the refactoring was fixing some serious memory leaks in Qt Export Object dialog, crash due to memory scope issues in GTK Export Object dialog, and addition sorting column feature in Qt dialog (set up by creating a widget to manage the items that were previously leaking memory) Bug: 9319 Ping-Bug: 13174 Change-Id: I515d7662fa1f150f672b1476716f347ec27deb9b Reviewed-on: https://code.wireshark.org/review/18927 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-02simple_dialog(.h): fix parameter 'Type' not found in the function ↵Alexis La Goutte1-1/+1
declaration [-Wdocumentation] Change-Id: I3dc476af941221b1d59f31bd6f639a49059e38a9 Reviewed-on: https://code.wireshark.org/review/19014 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-02Qt: Fix QStyledItemDelegate assertions.Gerald Combs4-3/+10
QStyledItemDelegate::paint asserts if you pass it an empty QModelIndex. We were doing this in PercentBarDelegate and TimelineDelegate in order to keep it from drawing any text. Return an empty string from ::displayText instead, which appears to be the correct way to paint without text. Bug: 13180 Change-Id: I8064d9575e04e95a926797eec7f6ad2b0bfef1c0 Reviewed-on: https://code.wireshark.org/review/19007 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-30Qt: fix crash when closing RTP player while playingPeter Wu1-0/+3
For some time, the RTP Player has been crashing for me (Arch Linux, Qt 5.7.0) when the RTP Player is active (affects also Wireshark 2.0.5). This call trace was observed: + RtpPlayerDialog::reject (closing dialog via Escape / Close button) + RtpAudioStream::stopPlaying + RtpAudioStream::outputStateChanged(QAudio::StoppedState) + QAudioOutput::deleteLater // problematic! + RtpPlayerDialog::~RtpPlayerDialog + RtpAudioStream::~RtpAudioStream As the QAudioOutput instance is a child of RtpAudioStream, it is also destroyed after that. QAudioOutput's destructor somehow invokes (via libqtmedia_pulse.so) a main loop iteration which invokes the previously scheduled deleteLater call. As QAudioOutput was already being destructed, this results in a crash. Workaround this by removing this child from RtpAudioStream (no cruelty intended). Change-Id: I88f2e929ac566534be5d2270e2e0b194685533eb Reviewed-on: https://code.wireshark.org/review/18970 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-30Qt: Fix simple_dialog formatting.Gerald Combs2-17/+35
Make sure that simple_dialog displays plain text. Trim whitespace and remove excessive newlines in order to improve message formatting. Add a comment about simple_dialog's behavior in Qt and GTK+ and how it might be improved. Bug: 13178 Change-Id: Ic6ff3cecd5ef1d76ec095d7a409f38e602b41ce2 Reviewed-on: https://code.wireshark.org/review/18985 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-29Qt: fix GoToPacket when Voip Calls dialog is closedPeter Wu3-9/+5
After opening the Call Flows dialog from the Voip Calls dialog, followed by closing the Voip Calls dialog, the Go To Packet functionality in the Call Flows dialog is broken. That happens because the signal is not proxied anymore. Just remove all these indirections via signals and directly update the selected packet. Change-Id: I9c6d519dbe800e4dfdf0407d832f17819b344e46 Reviewed-on: https://code.wireshark.org/review/18933 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-28Qt: Position UAT hint label just below the list.Stig Bjørlykke2-17/+17
Place the UAT hint label at the same position as in other dialogs; just below the main widget. Also use smaller font and italic. Change-Id: I51251825ff08122e17ca60144ef53fed5c6142ef Reviewed-on: https://code.wireshark.org/review/18969 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-28 20:29:23 +0000