summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-24Qt: Save preferences when hide/show columnsStig Bjørlykke1-0/+6
To preserve the hide/show column settings between switching profiles the settings have to be saved. Change-Id: I6f72b2980be149676e1c1099a604c8c6d0d995bf Reviewed-on: https://code.wireshark.org/review/12109 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 9601a4f724492b3f9960e1f051360b071997d7d6) Reviewed-on: https://code.wireshark.org/review/12110
2015-11-24VoIP: fix a null dereference when trying to retrieve the time of a T.38 ↵Pascal Quantin1-1/+1
tapped packet Rather than trying to retrieve frame_data from the packet number row (while it could be filtered) let's use pinfo. Bug: 11596 Change-Id: I53966bfdfbeb0c5918c3524f4b9748ea425fe8a5 Reviewed-on: https://code.wireshark.org/review/12103 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> (cherry picked from commit 8c46a728fed52b0432a234274cc3e7a6fcadaf6d) Reviewed-on: https://code.wireshark.org/review/12104
2015-11-24Qt: check that a file name was selected before trying to export follow contentPascal Quantin1-11/+13
Bug: 11763 Change-Id: Iab117fe9f572eccc3cf88a9f3ff86a22aa0e33c9 Reviewed-on: https://code.wireshark.org/review/12099 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> (cherry picked from commit 0981a50a57381fb33b010da791b7d82367b681cd) Reviewed-on: https://code.wireshark.org/review/12102
2015-11-24[Custom plugins] CUSTOM_PLUGIN_IN_FILES is no longer required.AndersBroman2-7/+0
Change-Id: I329a26ece145d70221d47c728e11dca54416a5cf Reviewed-on: https://code.wireshark.org/review/12092 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 46f3fe48a3bf1b5ea341544e2abd49910cacaa6e) Reviewed-on: https://code.wireshark.org/review/12093
2015-11-24Qt (Recent Files): Fix typo on variable nameAlexis La Goutte1-1/+1
Wrong variable (display field max) is updated when set max recent files Change-Id: Ie995192ffbf56cbf6bd9cea5b029ab16ff547d2f Ping-Bug:11748 Reviewed-on: https://code.wireshark.org/review/12046 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit ac2008c46fe2c19b5f0e41492dedb49261d9bc8c) Reviewed-on: https://code.wireshark.org/review/12081 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-24Fix indentation.Guy Harris1-1/+1
Change-Id: I2a64b9919d257ee0f7a57ba40c33bea1690ae0ad Reviewed-on: https://code.wireshark.org/review/12087 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-24Check *how many* fields sscanf() found.Guy Harris1-31/+82
In the code that parses a GeneralizedTime field, don't assume that all fields were found; check the return value from sscanf(). This should clean up a fuzz failure on the 2.0 buildbot: https://buildbot.wireshark.org/wireshark-2.0/builders/Fuzz%20Test/builds/13/steps/valgrind-wireshark/logs/stdio Change-Id: I431d7ed69ac1697bd42c22a37ca1451cfc85c94e Reviewed-on: https://code.wireshark.org/review/12083 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 921bb07115fbffc081ec56a5022b4a9d58db6d39) Reviewed-on: https://code.wireshark.org/review/12084
2015-11-23Qt: Fix column resolve namesStig Bjørlykke1-0/+4
Reset columns when resolve names column menu item is toggled, and save preferences to preserve the setting. We should probably have functions to redraw only one column. Change-Id: I52dce8d104ab9bedd11edc5d200ab85154243cb5 Reviewed-on: https://code.wireshark.org/review/12077 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 9851bed7a444b73215305d1de6029dd3679d3c25) Reviewed-on: https://code.wireshark.org/review/12078
2015-11-23Qt: Fixed more column issues when changing profile.Stig Bjørlykke2-2/+11
When changing profile without a loaded capture file we have to rebuild cap_file_->cinfo when a capture is loaded. Bug: 11493 Change-Id: I9b561a360236056c104cfdb478b855fa550325e2 Reviewed-on: https://code.wireshark.org/review/12068 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> (cherry picked from commit 7324555c1fef30a435a9be3c11c936b735507781) Reviewed-on: https://code.wireshark.org/review/12075
2015-11-23HiSLIP: remove a DISSECTOR_ASSERTPascal Quantin1-7/+6
It should not be used for request/response tracking Change-Id: Ic93884cad5bcea40e082081097575908011871c8 Ping-Bug: 11752 Reviewed-on: https://code.wireshark.org/review/12063 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 8fa938d27b7388e6b5881718d45abd3315a0583c) Reviewed-on: https://code.wireshark.org/review/12071
2015-11-23RADIUS: fix wrong offset for protocolAlexis La Goutte1-1/+2
Only work for IPv4 (Missing length of IPv6) Bug:11630 Reviewed-on: https://code.wireshark.org/review/12057 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> (cherry picked from commit dee3b8057ffdba29b812856b7ce5b4b5cdbed866) Conflicts: epan/dissectors/packet-radius.c Change-Id: I5436aa8dc66897472466ca9399c34457f1afa851 Reviewed-on: https://code.wireshark.org/review/12062 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-23Qt: Revert to more optimized codeStig Bjørlykke1-8/+5
Revert some changes in PacketListModel::headerData from c5fb4022 to preserve more optimized code. Change-Id: If708999a6d446d70eca7414670dec0c618190fe0 Reviewed-on: https://code.wireshark.org/review/12058 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 815b7fe728eadd15d9708afbc236b6399e4c46a0) Reviewed-on: https://code.wireshark.org/review/12059
2015-11-23Qt: Set tooltip for packet list headerStig Bjørlykke6-26/+56
Added get_column_tooltip() to use common code in GTK and Qt. Change-Id: I2f6ce95e2e129752bbb958a28aec6f42aa81be3d Reviewed-on: https://code.wireshark.org/review/12047 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-on: https://code.wireshark.org/review/12055 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-23Qt: Improved profiles popup menuStig Bjørlykke3-30/+31
* Don’t add a global profile if having a personal copy. * Fetch profiles from _current_ profiles list. * Separate personal and global profiles. * Use bold and checked for the the current profile. * Fixed selection of the current profile in the manage profiles dialog. * Aligned GTK version with Qt version, removed the “New from Global” sub menu. Change-Id: I2326b39f7d04411000b3c014e3775284392c48c7 Ping-Bug: 11704 Reviewed-on: https://code.wireshark.org/review/12034 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 35e5523dd2d90b6a964961b2eaea1457495b4a78) Reviewed-on: https://code.wireshark.org/review/12054 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-23epan: Free pointers to deallocated memoryStig Bjørlykke1-0/+6
When redissecting packets we call epan_free() which deallocates wmem_file_scope memory. Such memory may be used in proto_data for the currently selected packet (cf->edt) and leaves pointers to deallocated memory (cf->edt->pi.fd->pfd). Free them after epan_free() to avoid unintended usage in packet_list_clear(). Bug: 11740 Change-Id: Ia3bc54f3f34e644a98b8a7eb1addd19b8aeeaab9 Reviewed-on: https://code.wireshark.org/review/11996 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 391f11a7ec16045ed5909d617edcaada1f8f9afc) Reviewed-on: https://code.wireshark.org/review/12053
2015-11-23merge: fix parameter 'in_files/in_count_files' not found in the function ↵Alexis La Goutte1-6/+6
declaration [-Wdocumentation] Change-Id: Ib3d9b7df5f1396179645456ea7359e711c26b8ef Reviewed-on: https://code.wireshark.org/review/12003 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 9fad599c0f58092f0719839d980de849ba8f8400) Reviewed-on: https://code.wireshark.org/review/12052
2015-11-23Qt: Preserve selected file in welcome screen.Stig Bjørlykke1-0/+9
When closing a capture file the recent files list are updated to put the most recent opened file on top. Ensure we preserve the selection of the closed file instead of having the file in the closed file's previous position selected. Change-Id: I14c9edde55b88abf7ca7f1828e269ad49203b1db Reviewed-on: https://code.wireshark.org/review/12018 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit b9812a74325e9d08db09f17093f4cf9c9b5fe081) Reviewed-on: https://code.wireshark.org/review/12051
2015-11-22Add Windows CMake auto generated files to .gitignorePascal Quantin1-2/+21
This is useful in case of in tree build. Change-Id: I91a4503221ad097fd15e32677190b36c2d483c1f Reviewed-on: https://code.wireshark.org/review/12045 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 9e1128bfb6ca2cc75563813304e4feb9780f14f7) Reviewed-on: https://code.wireshark.org/review/12048
2015-11-22Quote the source directory in Git commands.Guy Harris1-3/+3
It may contain spaces (it does on my Windows 7 VM), so it must be quoted. (There are probably other places where it needs to be quoted in this script.) Change-Id: If363691b0f94bbe75755072fd5245266566c3360 Reviewed-on: https://code.wireshark.org/review/12043 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit b044e48c7005ecb4233e7d6991876ebe3b673edc) Reviewed-on: https://code.wireshark.org/review/12044
2015-11-22Quote the path for the Windows setup script.Guy Harris1-1/+1
The path may contain a space (it does on my Windows 7 VM), so quote it in the PowerShell command. Change-Id: Ib130991b8c29cb327832f2fe51cb37828526448b Reviewed-on: https://code.wireshark.org/review/12041 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit d69cec7cffc9e281b9a5dd389120f0791e1d805f) Reviewed-on: https://code.wireshark.org/review/12042
2015-11-22We *do* use setWindowModified; remove the XXX comment saying to do so.Guy Harris1-1/+0
Change-Id: I00ffc4c787681a6bf2c84da9e44b3b3a33c0cec5 Reviewed-on: https://code.wireshark.org/review/12039 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit cc9e444b4e92865aadd68a58e6d4f5d5453a340f) Reviewed-on: https://code.wireshark.org/review/12040
2015-11-22Qt: save columns position before freezingPascal Quantin1-0/+1
It allows to restore them properly in thaw() Bug: 11737 Change-Id: Ibee6ee701ab64019ee03666c652c232770b3bb74 Reviewed-on: https://code.wireshark.org/review/12037 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-22Qt: Added translate for "Capturing from ".Stig Bjørlykke1-9/+2
Change-Id: Ibd7b47169229395e5468ee2422c3dab7abe36413 Reviewed-on: https://code.wireshark.org/review/12022 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 358615019b63d4dbc62d8257cef3f9b00b7cb549) Reviewed-on: https://code.wireshark.org/review/12036
2015-11-22Qt: Set normal window icon when capture file closed.Stig Bjørlykke3-6/+6
Also rename and use setDefaultWindowTitle() to set the window title back to "The Wireshark Network Analyzer". Change-Id: Ifa87d1a9b9140de4f256effdfca8485f65e2f839 Reviewed-on: https://code.wireshark.org/review/12025 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit a02fc3b094628f504a13012f4cf5bb7ca61ff17f) Reviewed-on: https://code.wireshark.org/review/12035
2015-11-22asn2wrs.py: fix path substitution when generating ASN.1 dissectors with ↵Pascal Quantin1-2/+2
CMake on Windows Change-Id: I48e7d48544274f27d276e7128f8d2a2727c0b9cd Reviewed-on: https://code.wireshark.org/review/12031 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit d61c3d592b88ab9685b10552b29ab799a89ff0b7) Reviewed-on: https://code.wireshark.org/review/12032
2015-11-22Do not expand packets in packet dialog by defaultPeter Wu1-1/+0
Do not expand the packet tree in the packet dialog by default, it results in forgetting the previous collapse state and deviates from previous GTK+ behavior. It is just annoying to have all Frame, Ethernet, etc. trees expanded while you are just looking at application layer traffic. (The previous tree is restored when calling ProtoTree::fillProtocolTree which calls proto_tree_draw_node and then invokes setExpanded()). Bug: 11731 Change-Id: I48c7f28a1777874b1c23025335305493777bca1d Reviewed-on: https://code.wireshark.org/review/11998 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 759bfb6c45185c06be146b0705465e5560069dff) Reviewed-on: https://code.wireshark.org/review/12030
2015-11-22Fix RTP player crash on invalid streamsPeter Wu1-0/+5
On Linux with pulseaudio, the RTP player can crash when an invalid RTP stream is played. Prevent that by detecting when stream playback fails. Since the stateChanged signal receiver is registered on the same thread, it is guaranteed that any outputStateChanged calls happen before returning from audio_output_->start(). GTK+ not have this issue, its player simply does not show the decoded stream at all. Change-Id: I51a91a7f410ef3d46551bc8df0049542efbb806f Reviewed-on: https://code.wireshark.org/review/11997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 74247f96a998797e933f09f566f60406b9ba92b4) Reviewed-on: https://code.wireshark.org/review/12029
2015-11-22SCSI: Fix mixed up SCSI senddiag PF valuesStefan Pöschel1-1/+1
Change-Id: I5e4b3ff0579789d81bf4eaad3dc2669472d22dd7 Reviewed-on: https://code.wireshark.org/review/12024 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 26366ef795739920c858f5b7459476dc56677410) Reviewed-on: https://code.wireshark.org/review/12027
2015-11-21Lua: Validate Proto() argumentsStig Bjørlykke4-4/+34
Check if description (protocol name) and short_name are used before registering the protocol. This because proto_register_protocol() makes sure there's not already a protocol with any of the names registered and duplicates will be reported with a g_error() which terminates the Wireshark unexpectedly. Also check if short_name contains valid characters. Give appropriate error messages. Bug: 11739 Change-Id: Ib9776a2a3406ae5278ce744defd61864ebed0282 Reviewed-on: https://code.wireshark.org/review/11995 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-on: https://code.wireshark.org/review/12019
2015-11-21debian: Move icon and mime info file to wireshark-commonBalint Reczey3-5/+3
Change-Id: I4d8660b36810baa95f8b300af9790778dcba83a8 Reviewed-on: https://code.wireshark.org/review/11697 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> (cherry picked from commit f2ac2e477a19883bf1a4b76f25fa273c8b6e20af) Reviewed-on: https://code.wireshark.org/review/12012
2015-11-21debian: Fix bumping SO versionsBalint Reczey5-9/+9
Make dist failed due to library package renames and a few changes were also missing in d/control Change-Id: Iea8c054a3a32e10df73286e1535f33137e543e96 Reviewed-on: https://code.wireshark.org/review/12006 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-21Set major SO versions for release in CMake and debian/Balint Reczey11-29/+33
Also fix debian/*.symbol file contents Change-Id: I8c14aa69a04cc30d5667110ed31fdcef3baaf4aa Reviewed-on: https://code.wireshark.org/review/11973 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-21usbvideo: fix Malformed packet error for SET_CURPeter Wu1-4/+0
The SET_CUR request does not have an extended pseudo-header, the logic likely refers to the extra bytes in the usmon packet header. Remove it since the function handles the payload after that header. Tested with arkmicro_webcam.pcap (from bug 8414) and usb-malformed-error.pcapng.gz (from bug 11736). Bug: 11736 Change-Id: I61c71bb06c37a626260447f703a5cc4db2a6fc80 Reviewed-on: https://code.wireshark.org/review/12005 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-20Rule-Failure-Code enum value 14 added.Branislav Makan1-1/+1
Change-Id: If17ceba9d6e84bdb3b8d7e030fd7eccc45f9ff69 Reviewed-on: https://code.wireshark.org/review/11987 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 9b7aab935cbfde5d93309d5543df5a077d240a21) Reviewed-on: https://code.wireshark.org/review/11991
2015-11-20Qt: Fixed column issues when changing profile.Stig Bjørlykke2-14/+15
Always initialize prefs.col_list in pre_init_prefs. When switching to a profile without a saved 'preferences' file we have to initialize prefs.col_list to default values to avoid reusing settings from the profile we leave. This was introduced in 5012cf84e6d84a448171dac64c14d9c83e3d4ae6 Emit columnsChanged() before preferencesChanged(). This because columnsChanged() rebuilds cap_file_->cinfo which is used in preferencesChanged() to align columns (and possible other actions). Doing this in the wrong order will give an inconsistency and a heap-buffer-overflow if having different number of columns. Bug: 11493 Change-Id: I5792dfc0ede11b9457b96f092af8da00453787b1 Reviewed-on: https://code.wireshark.org/review/11971 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 0ae19656e12089271ea5941bcb4663bedc337b69) Reviewed-on: https://code.wireshark.org/review/11986
2015-11-20More spelling fixes found by lintianBalint Reczey29-33/+33
Change-Id: Id218dec9e5a721d6c63fd34962ffe50b6ab8dd56 Reviewed-on: https://code.wireshark.org/review/11946 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Diederik de Groot <dkgroot@talon.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit c297df134b4ba7afc84272a8c425a852e4b5408a) Reviewed-on: https://code.wireshark.org/review/11974
2015-11-19Profinet: use pinfo pool to build conversation filterPascal Quantin1-9/+7
Packet pool cannot be used from GUI. Bug: 11730 Change-Id: I4f5764a38a10809373c365ecf1ea50404a15b89a Reviewed-on: https://code.wireshark.org/review/11966 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> (cherry picked from commit cf562210de8997813abf624de36a5a70d73ac421) Reviewed-on: https://code.wireshark.org/review/11969
2015-11-19Fixing picosecond timestamp for vrt protocol. Needs to be parsed as uint64 ↵Nick Bedbury1-1/+1
not double Change-Id: I4c3cf4aa84a9208c382fa4a50ca3c2ffb1773ead Reviewed-on: https://code.wireshark.org/review/11962 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 1a841483e9df85f913ece0286a6e0d4f97a859c2) Reviewed-on: https://code.wireshark.org/review/11964
2015-11-19ASN1 (custom.make): fix typoAlexis La Goutte1-2/+2
Change-Id: I9cb151cad33c850fe6bb5b1fe8591a660cd4c0d9 Reviewed-on: https://code.wireshark.org/review/11811 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit ae6126fc5aee47719ce2168ed5508a7c6abaa165) Reviewed-on: https://code.wireshark.org/review/11963
2015-11-19NWP: use col_add_str to set COL_INFOPascal Quantin1-1/+1
As indicated in column-utils.h, col_set_str should only be used for const strings Bug: 11726 Change-Id: I4774aac7dfba3c0f27ed90f8a4634fa19595eacb Reviewed-on: https://code.wireshark.org/review/11958 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> (cherry picked from commit 9b2c889abe0219fc162659e106c5b95deb6268f3) Reviewed-on: https://code.wireshark.org/review/11960
2015-11-182.0.0 → 2.0.1.Gerald Combs13-1733/+25
Change-Id: I29a71f3bc76eb1fdc226c9f340c45fb3bcf7dffc Reviewed-on: https://code.wireshark.org/review/11955 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-18Build 2.0.0.Gerald Combs4-1254/+1066
Change-Id: I2f09c62dca2a06f86aa677fca8917af12aeb63f6 Reviewed-on: https://code.wireshark.org/review/11954 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-18Revert: Free cf->edt before free cf->epan when redissecting.Gerald Combs2-5/+1
Instead of freeing cf->edt before clearing the packet list, add an extra check to MainWindow::setMenusForSelectedTreeRow. Semi-blind attempt at fixing bug 11719. This reverts commit 8c211d51ef66b64c708f7ad079e7e7e913ac9f14. This reverts commit da71ccbf778cca5d9c48e010597570a40fd190c0. Bug: 11719 Change-Id: Ifd07be414ffd03a40bdfa7110395c9542bd86fc4 Reviewed-on: https://code.wireshark.org/review/11943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 3d3eb159a757c1b7f3abc0d2c81f8e38e206243b) Reviewed-on: https://code.wireshark.org/review/11953
2015-11-18Check for ECHILD, not for "not ECHILD".Guy Harris1-8/+34
That makes the logic a bit clearer (and puts the "unexpected other error" case at the end, where it should be). Put all the errno checks inside an else clause, making it clearer that it runs only if waitpid() returned -1. Add comments, including comments explaining why just driving on after getting EINTR should be OK. Change-Id: Iaa1b151393fcec8b4f5bd560ef913a224400932b Reviewed-on: https://code.wireshark.org/review/11951 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit bdea0d450476a077f64acbfe26e62251fcbb339d) Reviewed-on: https://code.wireshark.org/review/11952
2015-11-18Error from waitpid(): Fix Code is unreachableStephan Kappertz1-3/+3
Change-Id: Ib93bd7d62eb16177cfdcb82148c97a64f6e497b4 Reviewed-on: https://code.wireshark.org/review/11939 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 5c49facc4f2a9a054258c5921bc68293d6eab3e4) Reviewed-on: https://code.wireshark.org/review/11948
2015-11-18Qt: Don't update expert icon without a capture file.Stig Bjørlykke1-2/+3
We don't show the expert info icon when not having a capture file, so this should not be enabled when emitting redissectPackets(). Change-Id: I6ae6124ed9f69c214a2beadbdc670b15dfe3d060 Reviewed-on: https://code.wireshark.org/review/11937 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 73ee9178414e8d6bf7df3f508c407920c47359ee) Reviewed-on: https://code.wireshark.org/review/11942
2015-11-18Lua: Disable Reload Lua Plugins while reading file.Stig Bjørlykke3-4/+9
Hide the menu item if built without Lua. Change-Id: I316cddd55064da590eb4167b495a7fb00a41581f Reviewed-on: https://code.wireshark.org/review/11931 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> (cherry picked from commit 13297438d98e3388d650fc55c2a77d5b52367e1f) Reviewed-on: https://code.wireshark.org/review/11936
2015-11-18epan: Check for valid cf->edt before free.Stig Bjørlykke1-2/+4
Added a check for a valid cf->edt before calling epan_dissect_free(), as this will give an unintended assert. This is related to da71ccbf778cca5d9c48e010597570a40fd190c0. Change-Id: I7f7ceb1b25cfa2400063947f674df10ed6a93e9d Reviewed-on: https://code.wireshark.org/review/11934 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 8c211d51ef66b64c708f7ad079e7e7e913ac9f14) Reviewed-on: https://code.wireshark.org/review/11935
2015-11-18Export the value_string array ip_proto_val_ext for usage in pluginsJo Rueschel2-1/+2
Until now, it is not possible to use the IANA-assigned protocol values in a Wireshark plugin. This commit exports them for use on Windows machines. As discussed on http://seclists.org/wireshark/2015/Nov/88 Change-Id: I22adc33accf5d776bd3e5cc0899d3c5b9e9d531c Reviewed-on: https://code.wireshark.org/review/11874 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 92bb13a4d22a48c43aa5fa6910c68829edebfdd0) Reviewed-on: https://code.wireshark.org/review/11933
2015-11-17Fix crash in RTP Player on stop and closePeter Wu3-8/+28
When dragging the UI, this somehow causes a great lag. Then by spam-clicking on the Stop button, a double free seems to occur. Fix this by moving the audio cleanup to the outputStateChanged callback as documented at https://doc.qt.io/qt-5/qaudiooutput.html. Note that calling stop() in the IdleState also triggers a change event, resulting in the desired cleanup. Stop streams before the dialog is closed (via accept/reject). This *cannot* be done in the destrutor of RtpPlayerDialog because destructing QAudioOutput processes events from the event queue, resulting in preature destruction of other objects... crash. Change-Id: I6bfb33c9396e9bc1ffd346519d22390a97b6bdaf Reviewed-on: https://code.wireshark.org/review/11894 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 0fef9d752f801986a81b7c294143eae21cd0de97) Reviewed-on: https://code.wireshark.org/review/11930
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-22 03:10:30 +0000