summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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
2015-11-17CMake: Add Qt5Svg to PACKAGELIST.Gerald Combs1-0/+6
...otherwise we won't copy it to ${CMAKE_BINARY_DIR}/run/Wireshark.app on OS X, which means our flag icons won't be displayed. Bug: 11697 Change-Id: I26cd6a2dd13be35f9a80fd93adc8248848df5978 Reviewed-on: https://code.wireshark.org/review/11923 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit e3eb9f32081dafd97e058bf292e130e511f33748) Reviewed-on: https://code.wireshark.org/review/11929
2015-11-17Cleanups.Guy Harris1-15/+15
Change-Id: I3c92214afa876d830733474da88e0b7e3cda237a Reviewed-on: https://code.wireshark.org/review/11927 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 52e95fb075aae84c321a5eb1ccc7338f9bf381cc) Reviewed-on: https://code.wireshark.org/review/11928
2015-11-17Qt: Fixup the I/O Graph color menu width on Windows.Gerald Combs1-0/+7
Change-Id: I2032709fe62810a292121e8624a4b51f40070c36 Reviewed-on: https://code.wireshark.org/review/11921 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit ec68330053267c6c368013f761d0cf7efe5a0cf3) Reviewed-on: https://code.wireshark.org/review/11926
2015-11-17Lua: Do not deregister Listener in __gc.Stig Bjørlykke1-10/+5
Listeners should not be deregistered in __gc because they will go out of scope while in use. Instead free allocated data when deregistering the Listener (Listener.remove() and Reload Lua Plugins). Bug: 11722 Change-Id: Iadf6506757df06e476ac3cac38c05f1d1d497dc4 Reviewed-on: https://code.wireshark.org/review/11924 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 8383cb923b63535b46d52f00f430f784cbbb9014) Reviewed-on: https://code.wireshark.org/review/11925
2015-11-17Qt: Fix some flow graph issues.Gerald Combs2-17/+14
Make fillDiagram() a slot and call it after the dialog is visible. Use the activated() signals instead of currentIndexChanged() for our comboboxes. The former is only emitted as a result of user interaction and the latter is always emitted when the value changed. This was a problem for flowComboBox since initializing its value resulted an extra call to fillDiagram(). Add a progress frame. Change-Id: I17bcf5c990363ee758be9e3a0604dde34fc34f2d Ping-Bug: 11710 Reviewed-on: https://code.wireshark.org/review/11897 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 689334876ec12d5a037e5bb1fad3e0d023890049) Reviewed-on: https://code.wireshark.org/review/11919
2015-11-17[Diameter] Add Diameter Overload Indication AVPs [RFC 7683]AndersBroman1-2/+57
Change-Id: I003e5a9f770f14d6e18cc8df970d35a7ed4f03bb Reviewed-on: https://code.wireshark.org/review/11914 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 04f3f65ebd0b7f0e740c6d8b3711a73e5c5c53da) Reviewed-on: https://code.wireshark.org/review/11916
2015-11-17Qt: Fix Follow Dialog crash.Gerald Combs1-5/+9
Don't set WA_DeleteOnClose. This keeps the dialog from deleting itself when we're inside a nested event loop (i.e. when we're reassembling (TCP) or retapping (UDP or TLS)). Make sure our beginRetapPackets() and endRetapPackets() calls are balanced. Move updateWidgets() calls to follow() so that we update on the first run. Bug: 11711 Change-Id: Id585be410a315b914b27f1a116d451c863087b00 Reviewed-on: https://code.wireshark.org/review/11892 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit a18f8c84cf4e8cd98a44ce3019d25fb48dc7b23e) Reviewed-on: https://code.wireshark.org/review/11915
2015-11-17extcap: fix a crash introduced in g622603bPascal Quantin1-1/+1
When using GTK UI, cfilter is initialized to NULL, not to an empty string. Change-Id: Ic9f3957d4de551a929578e76d5b9c63936517299 Reviewed-on: https://code.wireshark.org/review/11910 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 9ba4c95b5590c5fa3d22f6089e216b79a5c00079) Reviewed-on: https://code.wireshark.org/review/11911
2015-11-17Qt: Fix a merge crash.Gerald Combs2-5/+3
Update the logic in ui/qt/main_window.cpp:mergeCaptureFile to match ui/gtk/capture_file_dlg.c:file_merge_cmd. This ensures that we don't try to use a stale (and freed) read filter. Call cf_set_rfcode in both. Bug: 11718 Change-Id: I6da65e428bff39e907f45992bac7337880c02ce9 Reviewed-on: https://code.wireshark.org/review/11895 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 7518a74dbb32f941509a5dcabb5f74a3af14985d) Reviewed-on: https://code.wireshark.org/review/11909
2015-11-17Win32: Try to fix handle leaks in capture_sync.Gerald Combs1-0/+6
If CreateProcess succeeds, close our child's primary thread handle. As the PROCESS_INFORMATION page at https://msdn.microsoft.com/en-us/library/windows/desktop/ms684873.aspx says, If the function succeeds, be sure to call the CloseHandle function to close the hProcess and hThread handles when you are finished with them. Otherwise, when the child process exits, the system cannot clean up the process structures for the child process because the parent process still has open handles to the child process. Closing the handle immediately doesn't seem to do any harm here, but add a note that we might want to store it and close it later. In sync_interface_stats_open, close our message and data descriptors after calling sync_pipe_wait_for_child. Ping-Bug: 11702 Change-Id: I56e0625fdceb66fba822c2dc83e07d40844329a7 Reviewed-on: https://code.wireshark.org/review/11882 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 527e032b800b11fe3e816659c542e3680981b34c) Reviewed-on: https://code.wireshark.org/review/11906
2015-11-17Extcap: allow Wireshark to list extcap interfaces even when WinPcap / Npcap ↵Pascal Quantin2-10/+4
is not installed Bug: 11715 Change-Id: I4a043c4a298506d51cb6bf8b97aac787113a7dfa Reviewed-on: https://code.wireshark.org/review/11869 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Guenter Ebermann <guenter.ebermann@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 167874a62bb8375eb07637d28e98ea45e497075f) Reviewed-on: https://code.wireshark.org/review/11905
2015-11-17extcap: fix a bug in cfilterDario Lombardo1-1/+1
When no filter is specified, interface_opts.cfilter is not null but an empty string. Change-Id: I5755ab7dd840be28334768cf26999048441fcc4e Reviewed-on: https://code.wireshark.org/review/11907 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 622603b277043bca649e4a370af252bb4802181c) Reviewed-on: https://code.wireshark.org/review/11908
2015-11-17Create C handles for pipes before running dumpcap.Guy Harris1-39/+90
If the C handles can't be created, there's no point in running dumpcap. Catch some more possible _open_osfhandle() failures while we're at it. Change-Id: I2b955378705fc932f8d383804e908e95a957be44 Ping-Bug: 11702 Reviewed-on: https://code.wireshark.org/review/11890 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> (cherry picked from commit 14c35c31d8e77f95abaa601c42566636197641e1) Reviewed-on: https://code.wireshark.org/review/11903
2015-11-17Qt: Removed obsolete comments.Stig Bjørlykke1-4/+0
Change-Id: I7c0905b38a668a7a6dcaeee6ec16761c9b5c0a55 Reviewed-on: https://code.wireshark.org/review/11901 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 2dc3b98cca40b9ed3268cb03cf7542c7615eed30) Reviewed-on: https://code.wireshark.org/review/11902
2015-11-17Qt: avoid crash when use Go Next/Previous ConversationAlexis La Goutte1-0/+2
Only enable this menu when there is a packet Change-Id: I750f2af6e9f565afce83a5e84394cc96b3b071f9 Reviewed-on: https://code.wireshark.org/review/11868 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit d3f68e576677d46426af398f5a66499ac3f99e46) Reviewed-on: https://code.wireshark.org/review/11900
2015-11-17Qt: setMenusForSelectedPacket when capture file is closed.Stig Bjørlykke1-2/+2
Moved setMenusForSelectedPacket() to captureFileClosed() because capture_file_.capFile() is still valid in captureFileClosing(). Menu items depending on is_ip, is_tcp, is_udp, is_sctp, is_ssl, is_rtp and is_lte_rlc must be disabled when closing the capture file because many of the dialogs does crash when launched without a valid frame selected. All dialogs should probably have a guard for this to avoid crashes, but that may be an exercise for an enhancement to add support for the dialogs to follow the current loaded capture file. Change-Id: If5837a355d08df76547572a25d46ffa539070de3 Reviewed-on: https://code.wireshark.org/review/11883 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 062e5b3118de4c4658f4379d3e84f273e3976a97) Reviewed-on: https://code.wireshark.org/review/11899
2015-11-17CMake: Add "C:/tools/cygwin" to FindCygwin.cmake.Gerald Combs1-0/+1
Add C:\tools\cygwin to the list of search paths in FindCygwin.cmake. This matches the behavior of config.nmake and is where Chocolatey installs Cygwin. Change-Id: I87a3cd64aae410b9c9abdc87c56d29aa3c4d5946 Reviewed-on: https://code.wireshark.org/review/11885 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 9a7973770e19dca8ee455d60efb0b46c3bafef98) Reviewed-on: https://code.wireshark.org/review/11898
2015-11-17Remove old, unused images.Gerald Combs2-461/+0
Change-Id: I25c3d4b7d346940c4885b3b11c26fd3415d7fca8 Reviewed-on: https://code.wireshark.org/review/11893 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 1aeb3cb9897ce23b397f308d6c1886400c863e1b) Reviewed-on: https://code.wireshark.org/review/11896
2015-11-16Catch failure of _open_osfhandle().Guy Harris1-0/+24
This may at least prevent the crash in bug 11702, by not returning "success" with bogus file handles of -1, if the opens fail due to leaks chewing up all the available slots. More investigation needs to be done to see why we're leaking. Change-Id: I89ecff4b03bca140f05c838e1e2604a03409f803 Ping-Bug: 11702 Reviewed-on: https://code.wireshark.org/review/11881 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> (cherry picked from commit 9ec2cbb1c2f2917a9b9e149def8da8c072134524) Reviewed-on: https://code.wireshark.org/review/11888
2015-11-16Qt: do not clear display filter when merging filesPascal Quantin1-7/+6
The merge file dialog box contains a read filter, not a display filter. Bug: 11713 Change-Id: Iff160e552e0440ea4c626d54d834d32f38dc54c2 Reviewed-on: https://code.wireshark.org/review/11875 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 4224aab3453ab98c76d80bebae6301aa7c962fe3) Reviewed-on: https://code.wireshark.org/review/11884
2015-11-16For now, call the finish routine in Lua file writers "close".Guy Harris3-11/+11
If we ever change the way file writers work, in a fashion incompatible with the existing way they work, we'll also rename this member - and get rid of checks for earlier versions of the Lua interface. Change-Id: I64065944fa31371f5249cafd930c18f180ad7299 Reviewed-on: https://code.wireshark.org/review/11879 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 95fd55e56ba39b3b3b844a7ff65a418eced62ab2) Reviewed-on: https://code.wireshark.org/review/11880
2015-11-16Label the filter in the file open dialog as a "read filter".Guy Harris12-128/+161
This matches what the Windows file open dialog says, and also should help prevent people thinking that it's a display filter, so that you can clear it and see all the packets in the file. I leave translations to native speakers. Bug: 11708 Change-Id: I060816357bf7958d516429d09708a7ce16d609c5 Reviewed-on: https://code.wireshark.org/review/11877 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e9dd7c8bd42cbb25ca92dde3cee0383db6c20705) Reviewed-on: https://code.wireshark.org/review/11878
2015-11-16Qt: deactivate save / close / reload buttons when rescanning a capturePascal Quantin1-1/+1
Bug: 11703 Change-Id: I34f5c15c41ebbc62877945eabd3604ba90d5cf74 Reviewed-on: https://code.wireshark.org/review/11804 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 92d487a461414c9b797130e5b845488164c984cd) Reviewed-on: https://code.wireshark.org/review/11876
2015-11-16Don't include wireshark-gtk.desktop in RPMs.Jeff Morriss1-2/+4
The RPMs use 'alternatives' to determine which GUI is used so it doesn't make sense to have 2 desktop entries: one for 'wireshark' (Qt or Gtk GUI, depending on configuration) and one for 'wireshark-gtk' (the Gtk GUI). (Maybe it makes sense to just not use 'alternatives' and allow the user to pick which GUI is used via the menu system. But then if they wanted to run the Gtk+ GUI from the command line they'd need to remember to run 'wireshark-gtk' even if that's the only GUI installed...) Change-Id: I9d3fe13bb01eab87caad4ad21c6571ef6288b110 Reviewed-on: https://code.wireshark.org/review/11780 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> (cherry picked from commit fc51af45e65b534fa52c5519e23a7250ada195be) Reviewed-on: https://code.wireshark.org/review/11873
2015-11-16Qt: add a reference counter to sequence analysis infoPascal Quantin6-47/+72
Increment the reference counter each time a flow sequence window is opened. Free seq_analysis_info_t structure once the last flow sequence / VoIP calls / SIP flow window is closed. Bug: 11712 Change-Id: I20fcb922b0516417d4bd74cdf75475dcb31f8b90 Reviewed-on: https://code.wireshark.org/review/11851 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 2773596970c362a6d81c7e44311781590074c43f) Reviewed-on: https://code.wireshark.org/review/11867
2015-11-16ssl: add expert info for session resumptionPeter Wu4-79/+81
Add expert info to the Change Cipher Spec tree when session resumption is detected. This can be used as hint that decryption using a RSA key file will not succeed because of missing key material. The name of this expert info is "ssl.resumed" or "dtls.resumed" and the expert info message is "This session reuses previously negotiated keys (Session resumption)". Change-Id: I4a83edb13417631c97d6cfc4a57e2086bd217878 Reviewed-on: https://code.wireshark.org/review/11583 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit e0cf8b6ccfdde4a256645979f39b2e46b92e963c) Reviewed-on: https://code.wireshark.org/review/11866 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-16ssl-utils: add versions to ssl debug logPeter Wu4-24/+23
Add Wireshark/GnuTLS/Libgcrypt versions to the debug log file. Remove ssl_lib_init since it didn't do anything useful (the debug file was not open yet so it would write... nothing). Match more (EC)DH(E) cipher suites and try to improve the message. Add the human-readable name besides numeric cipher suite IDs. Change-Id: I84a33d270f91e90efc55371475b231b483fd24c9 Reviewed-on: https://code.wireshark.org/review/11403 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 07ceb2c6dc5167bc2fe8f1f000c3a3d64571396e) Reviewed-on: https://code.wireshark.org/review/11865 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-16Revert "Override optimization and other flags for make based generators."Peter Wu1-7/+0
Some compiler flags may not be passed twice (such as -mllvm -msan-keep-going), so avoid duplicating CMAKE_C(XX)_FLAGS. When -DCMAKE_BUILD_TYPE=<type> is set, you can override the default optimization and debug flags with -DCMAKE_C_FLAGS_<type>=.... This reverts commit 15a238a28d0dbfffe908a6451e411a64a34da678. Change-Id: I4e1cf11c49eaf00ad4a2c430454a127b4be20d9e Reviewed-on: https://code.wireshark.org/review/11597 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 442314e8b2bdc4ea921bd7136aadb851652f4ce7) Reviewed-on: https://code.wireshark.org/review/11864
2015-11-16[docsis->ucd] Add support for 6 new TLVsAdrianSimionov1-5/+244
Change-Id: I65a40b1765f8433c47acbc34452d5336d7df84c1 Reviewed-on: https://code.wireshark.org/review/11788 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 4dea5dbc90f87a0b4805fd566dae39e02957cc1c) Reviewed-on: https://code.wireshark.org/review/11863 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-16[docsis->ucd] Removed S-CDMA bursts and added expertAdrianSimionov1-112/+27
UCD Type 2 is for TDMA/ATDMA, S-CDMA goes in UCD Type 29. More info: Table 8-19 from RFIv2.0-C02 for DOCSIS 2.0 Table 6-25 from MULPIv3.1-I07 for DOCSIS 3.1 The comment was removed because the Burst Descriptors below are not new anymore, are just Burst Descriptors like all the rest. Change-Id: I992a84c9bf0b999b9cec5bd44f2e584ef22ce401 Reviewed-on: https://code.wireshark.org/review/11847 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> (cherry picked from commit 6c1ae95dc73585dba45c76c6eae33545cedfbedc) Reviewed-on: https://code.wireshark.org/review/11862
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-02 07:38:32 +0000