summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-27Fix crash in Capture File Properties dialogPeter Wu1-1/+2
Fixes crash when a capture file is closed while the capture file properties dialog is open. Change-Id: Iba35be38e1f53d422ff8428a672703385d477660 Reviewed-on: https://code.wireshark.org/review/12224 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 946222c676dbda138fff0b437be12f8fddab5131) Reviewed-on: https://code.wireshark.org/review/12226
2015-11-27autotools: do not apply CFLAGS in reverse orderPeter Wu2-33/+41
Fixes false "-Wvariadic-macros" because "-Wpedantic" came after "-Wno-variadic-macros". While at it, avoid (unintentionally?) adding -fPIE to all C++ programs (via CXXFLAGS). Availability of flags is checked by appending a flag (in case the user has something like CFLAGS=-Wno-error). This removes a -fPIE check for CXXFLAGS and removes 5 -Woverlength-strings and 9 -Wvariadic-macros warnings from make with Clang 3.7.0. configure and compile times were equal. (A diff between the configure outputs showed no other changes.) This reverts commit cf0d762d7304aa569ea25faf999c74bbe94f9023 and applies a different approach. Ping-Bug: 10791 Change-Id: Ic7b4137e2d98b06bc7625091be9bc7dd69182586 Reviewed-on: https://code.wireshark.org/review/12175 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> (cherry picked from commit 470c745a7a0a5b930bdfb0edd8874436cb9beea0) Reviewed-on: https://code.wireshark.org/review/12186 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-27configure.ac: Fix CXXFLAGS with optimization for HP-UXJoão Valverde1-1/+1
Change-Id: I0cdef95ce44fb5c6112998697dbafe23c3ee13ab Reviewed-on: https://code.wireshark.org/review/12212 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit faf680fbd4c129679b94f78bf76a9e1b955a5729) Reviewed-on: https://code.wireshark.org/review/12218
2015-11-27Qt: Check zero recent column widthStig Bjørlykke2-22/+28
Hidden columns may have been stored with zero width, so ensure we always check for this when fetching. Change-Id: I625c05adccaf2d81198fdeeccf7feeb9a9eb82c2 Reviewed-on: https://code.wireshark.org/review/12196 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 f5b816d4c92e633453fe65dfa56d80ad32bab477) Reviewed-on: https://code.wireshark.org/review/12217
2015-11-27[LDAP] Bugfix counting of search results.Michael Mann2-6/+6
Bug: 11761 Change-Id: Icd955b848edc9f802331f25ab1b8684aa2631553 Reviewed-on: https://code.wireshark.org/review/12184 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 c51f207308d04bda005f84828b59cec4104e4b8f) Reviewed-on: https://code.wireshark.org/review/12216
2015-11-27Qt: display RTP/IAX2 graph analysis arrival time as absolute instead of relativePascal Quantin2-4/+4
It makes it easier to synchronize the graph and packet list Change-Id: Ia0c6bc46227c1ff9267622ff52b5a5d966cd6e6a Reviewed-on: https://code.wireshark.org/review/12195 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: Anders Broman <a.broman58@gmail.com> (cherry picked from commit d9f777c99a8af01bcf89fb869602cebdf47f9adf) Reviewed-on: https://code.wireshark.org/review/12215
2015-11-27Qt: display RTP stream Y axis values as millisecondsPascal Quantin1-6/+6
Bug: 11784 Change-Id: I505338d85788e0889999622ff392ca8fe5f46836 Reviewed-on: https://code.wireshark.org/review/12194 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: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 2c6824df2dadb3dafeab247301c15252d0a50461) Reviewed-on: https://code.wireshark.org/review/12214
2015-11-26Don't allow the "Ethertype" pseudo-protocol's dissection to be disabled.Guy Harris1-0/+2
It's not a real protocol, it's a helper dissector for various protocols, and it makes no sense to disable it; doing so means that the Ethertype field itself isn't disabled, and allowing it to be disabled means that you can't do "Disable All", and manually enable Ethernet, IPv4, IPv6, and TCP to disable dissection of protocols running atop TCP on Ethernet. (See https://ask.wireshark.org/questions/48011/enabled-protocols-negation-of-disabled-proto for an example of somebody who wants to do exactly that.) Change-Id: Ibdd6ef53503de548e14cecc3766040c3a0b101d4 Reviewed-on: https://code.wireshark.org/review/12207 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 677faf2bd4bf233a7d8243b5c5abccf3111cfc5c) Reviewed-on: https://code.wireshark.org/review/12208
2015-11-26Wrong field name for signal strength as a percentage.Guy Harris1-1/+1
Copy-and-pasteo. Change-Id: I42ba4f172f9b837f01d3b30f2d14e7ee066f3e83 Reviewed-on: https://code.wireshark.org/review/12203 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e988e1c76488e5e8ee685ca0dca62578120f1467) Reviewed-on: https://code.wireshark.org/review/12204
2015-11-26Don't check whether the C++ compiler supports a flag if there isn't one.Guy Harris1-93/+102
If we didn't find a C++ compiler, we can't check whether the non-existent C++ compiler supports a flag, so don't do so. Change-Id: I3d3232acae2dfc40deb0b01f35656ef53c4f1640 Reviewed-on: https://code.wireshark.org/review/12132 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 6181045bc161678496d557d61f7665c04b2e2ba2) Reviewed-on: https://code.wireshark.org/review/12185
2015-11-26Qt: make Files Set dialog modelessPascal Quantin1-1/+1
Otherwise you need to close the window each time you change the file so as to browse its content... Change-Id: Ibf8485695cec34bb950ad98cb671e77d4f663b63 Reviewed-on: https://code.wireshark.org/review/12187 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 c965fb06148d0144426ba1b3fb301281a30a39b8) Reviewed-on: https://code.wireshark.org/review/12200
2015-11-26Qt: clear new_visible_rows_ when closing a capture filePascal Quantin1-0/+1
Bug: 11756 Change-Id: Iccc92963f81c3ded143953c8c1fad27cd57a7bc2 Reviewed-on: https://code.wireshark.org/review/12193 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-26Qt: Use correct column width when switching profileStig Bjørlykke2-4/+21
QTreeView::setColumnHidden() saves column width on hide and restores column width on show. When switching from a profile with hidden columns to a profile where this columns are shown we get a sectionResized() signal with the saved width from the old profile, initiated from columnsChanged() -> setColumnVisibility(). We must avoid setting this as a new column width because this is recent values from a old column layout. In other cases we use setColumnVisibility() we don’t need to set a new column width either, because we store the column width ourself. Don't store column width when hiding column (new_width == 0). Restore column width when showing column because profiles may have changed the packet_list layout. Change-Id: I7e89c3477402ec6d621cd2015ee74b086f60d6cb Reviewed-on: https://code.wireshark.org/review/12111 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 4980d505f268b2b1d2ebabf815f3d0ce34e8cd71) Reviewed-on: https://code.wireshark.org/review/12192
2015-11-26Lua: Switch URL to documentation to HTTPSUli Heilmeier1-2/+2
URL to documentation with https as suggested by Alexis. (s. commit ecc9c74326183e8d03eddfdbc1557919f3be6046) Change-Id: I64d82b0c07cce5658eb8f4ae758f1a42946b837a Reviewed-on: https://code.wireshark.org/review/12181 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit ff5719c6e846c2d699c27f972ef5af4740a7a74c) Reviewed-on: https://code.wireshark.org/review/12191
2015-11-26Change TCP transmission window full messageMichael Mann1-1/+1
Bug: 11741 Change-Id: I2b3adc82bc44fd4e83e6f04b7e9bdcfaadf1b445 Reviewed-on: https://code.wireshark.org/review/12180 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 986a870145903e1b752711a47ac53d9eb0c85cde) Reviewed-on: https://code.wireshark.org/review/12189
2015-11-26Document tvb_get_guintXXX and tvb_get_ieee_XXXMichael Mann1-0/+27
Change-Id: I498c0ca39befa0c0117ee78c23714bf7af193ce9 Reviewed-on: https://code.wireshark.org/review/12164 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 2cf37ea0a09771e59353368ad187e9ad647e3d90) Reviewed-on: https://code.wireshark.org/review/12178 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-26L2TP: Correct L2TP over IP SHA1 message digestNicolas S. Dade1-1/+1
It should match the MD5 code, and skip over the 0x00000000 session id at the start of tvb. Change-Id: Ia3bee2bd07015523acc49bd7cb0247c3f1ac986e Reviewed-on: https://code.wireshark.org/review/12168 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 97e627e56d98bc45cd87cf629617c0dbd1798f6b) Reviewed-on: https://code.wireshark.org/review/12176
2015-11-26NSIS: refuse to install on Windows XP or Server 2003Gerald Combs2-47/+146
Warn the user when installing on Windows Server 2003 along with XP. CMake builds are not targeting them, and their support was officially dropped with Wireshark 1.12. Update our copy of GetWindowsVersion.nsh with "Alternate Script With Server Versions" from http://nsis.sourceforge.net/Get_Windows_version. Change-Id: I762859ea13e1ecd91757eeab360a39d1e6116144 Reviewed-on: https://code.wireshark.org/review/11972 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit a9f5d8503f85704bd6facc2de3f51f5d83f4862c) Reviewed-on: https://code.wireshark.org/review/12173
2015-11-26SCTP: add another NULL dereference checkPascal Quantin1-6/+8
This is a follow-up of g2259bf8 Change-Id: I4dfb839fcd016a8d7a7210e6358d230025eb96a3 Reviewed-on: https://code.wireshark.org/review/12171 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 1b32d505a59475d51d9b2bed5f0869d2d154e8b6) Reviewed-on: https://code.wireshark.org/review/12172
2015-11-26Qt: Redissect packets when changing profileStig Bjørlykke1-0/+2
When changing profile the protocol/dissector preferences may change so we need to redissect according to new settings. We should probably have a preferences diff to check if a redissect is needed, like it is in the preferences dialog. Bug: 11757 Change-Id: I025bbc7297966986a697f2a6368d9a74e3c1ba72 Reviewed-on: https://code.wireshark.org/review/12156 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit ce9d2ee428ce699e8b1c0c184a38cd75441e8d25) Reviewed-on: https://code.wireshark.org/review/12169
2015-11-26ISUP: fix a wrong removal of proto_tree_add_text()Pascal Quantin1-11/+3
Bug: 11768 Change-Id: I42199f391f6559de88ce37104bd74a9f4be77e09 Reviewed-on: https://code.wireshark.org/review/12149 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: Michael Mann <mmann78@netscape.net> (cherry picked from commit b1044d6553241aa10189ff1fc064702c767a09b8) Reviewed-on: https://code.wireshark.org/review/12163
2015-11-26SCTP: verify frame pointer before dereferencing itPascal Quantin1-6/+8
Bug: 11767 Change-Id: Icd01550e0aaa4cd0cc33ae3acc0ef702c38f4db4 Reviewed-on: https://code.wireshark.org/review/12146 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: Michael Mann <mmann78@netscape.net> (cherry picked from commit 2259bf8a827088081bef101f98e4983de8aa8099) Reviewed-on: https://code.wireshark.org/review/12158
2015-11-25qt: move file close (CID 1159303)Dario Lombardo1-2/+3
Change-Id: Ib21327babc77324313a1b3e2dd6ba0987a8fb333 Reviewed-on: https://code.wireshark.org/review/12144 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit b314342c0043d411912a7aff339d8cdd6ee413aa) Reviewed-on: https://code.wireshark.org/review/12154
2015-11-25Press Start instead of Manage Interfaces on EnterPeter Wu2-2/+2
In the Capture Interfaces dialog, the default dialog action was non-existing. Fix Extcap while at it (searched for "YesRole"). Reported on #wireshark at Freenode. Change-Id: I7920b806a855acc20dcd2081f6b0d58e993b4ac1 Reviewed-on: https://code.wireshark.org/review/12136 Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit dde848b3d925d040592bd3f86487e9bc86905550) Reviewed-on: https://code.wireshark.org/review/12140
2015-11-25Fix memory leak in capture_get_if_capabilitiesMikael Kanstrup1-0/+2
Valgrind reports memory leaks like these: 154 bytes in 10 blocks are possibly lost in loss record 8,660 of 11,855 at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0xBD9EA38: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4) by 0xBDB3358: g_strndup (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4) by 0xBDB49AD: g_strsplit (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4) by 0x502291: capture_get_if_capabilities (capture_ifinfo.c:269) by 0x50A4CC: scan_local_interfaces (iface_lists.c:186) by 0x4C4BBD: refresh_local_interface_lists (capture_dlg.c:6117) by 0x504EC8: iface_mon_handler2 (iface_monitor.c:113) by 0xC9ADF1D: ??? (in /lib/libnl-3.so.200.3.0) by 0xC56DF19: ??? (in /usr/lib/libnl-route-3.so.200.3.0) by 0xC9ABE5E: nl_cache_parse (in /lib/libnl-3.so.200.3.0) by 0xC9AF5CA: nl_msg_parse (in /lib/libnl-3.so.200.3.0) Under certain conditions raw_list variable was not freed properly. Change-Id: Ibbaf0d67d983ee6912cfc9dc1a3169bc773b03c9 Reviewed-on: https://code.wireshark.org/review/12112 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 479ab3bcdc8d79b27bfc99fcde073457f72126ac) Reviewed-on: https://code.wireshark.org/review/12139
2015-11-25Fix buffer overrun in zlib decompressionPeter Wu1-3/+6
After updating next_in (to remove the gzip header), avail_in must also be updated. Failing to do makes zlib read past the input buffer. In theory this would resukt in a buffer overrun of at most double the input length, in practice zlib returns as soon as the compression fails (after reading a few bytes). Bug: 11548 Change-Id: If71691a2846338f46d866964a77cc4e74a9b61dd Reviewed-on: https://code.wireshark.org/review/12038 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 cec0593ae6c3bca65eff65741c2a10f3de3e0afe) Reviewed-on: https://code.wireshark.org/review/12137
2015-11-25Lua: fix URL to documentationUli Heilmeier1-1/+1
The Lua reference has been moved from User's Guide to Developer's Guide. Change-Id: I3489d774e54310ce49997e33d5318adf5e0bb2bc Reviewed-on: https://code.wireshark.org/review/12128 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit ecc9c74326183e8d03eddfdbc1557919f3be6046) Reviewed-on: https://code.wireshark.org/review/12129
2015-11-25Check whether create_tempfile() fails.Guy Harris1-0/+5
Thanks and a tip of the Hatlo hat to Coverity for finding this. Change-Id: Ie9d4089443e52ef427e0cc8ae6e90a9d9787134e Reviewed-on: https://code.wireshark.org/review/12123 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e9c26d015bde3ca5e5bf858ddb266a70d6751b7d) Reviewed-on: https://code.wireshark.org/review/12124
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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-01 06:58:15 +0000