summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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
2015-11-16Qt iograph: Fix off-by-one, insure we plot the last interval.Jim Young1-1/+1
Bug: 11693 Change-Id: I035eaf7ff049e3631714c112daa5adb29bb90470 Reviewed-on: https://code.wireshark.org/review/11858 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 9451e529c475fb8108c7bfe53ad229f32631f517) Reviewed-on: https://code.wireshark.org/review/11859
2015-11-16Try retroactively applying the Qt folks' fix for QTBUG-47942.Guy Harris1-5/+33
The current version of the fix only adds -fPIC under certain circumstances; we check whether it was added and, if it was, and those circumstances are *not* in effect, we remove it. Bug: 11643 Change-Id: Ib806818a263141bd4ce042978d44941c20659ffe Reviewed-on: https://code.wireshark.org/review/11857 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-15tcp: Indicate number of bits used for Flags.Stig Bjørlykke1-1/+1
Change-Id: Iac003993e820e3ad5ecbe2c9322bce1957a14c25 Reviewed-on: https://code.wireshark.org/review/11855 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 6012ba8f008bfba24fd44ce7a2a3055572453dce) Reviewed-on: https://code.wireshark.org/review/11856
2015-11-15tcp: Revert back to the old Flags entry.Stig Bjørlykke1-2/+2
A similar issue was discussed and fixed for IP Flags in d051e79a (svn revision 33264). Change-Id: I532f51e813aee707b9573537cb8fbdb823158a61 Reviewed-on: https://code.wireshark.org/review/11817 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 2db454361d4115caaf08b8c1df57f05ee1c0694e) Reviewed-on: https://code.wireshark.org/review/11854
2015-11-15Lua: Fixed some argument # in argument errors.Stig Bjørlykke1-4/+4
Change-Id: I1dba41c9f129d368096dd69a0f40fa2164311124 Reviewed-on: https://code.wireshark.org/review/11852 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 561bcff0270106226bc8fb6ae49c54e407d06f46) Reviewed-on: https://code.wireshark.org/review/11853
2015-11-15FindLUA.cmake: reject version 5.3Peter Wu1-14/+22
Lua 5.3 could still be used when located at /usr/include/lua.h. Detect and reject it in that case. Rename LUA_VERSION to LUA_VERSION_NUM to avoid a conflict with pkg-config (which uses a different version format). Ensure that the regex matches a number only. Bug: 11706 Change-Id: Idb7e3e1a8d9c6e4ab9ab1816c4dedea7de9dde8e Reviewed-on: https://code.wireshark.org/review/11836 Reviewed-by: Bill Meier <wmeier@newsguy.com> (cherry picked from commit 67ad1de0d06128c9eda70adb3f172c8b7ff4d6b6) Reviewed-on: https://code.wireshark.org/review/11848 Petri-Dish: Bill Meier <wmeier@newsguy.com>
2015-11-15Lua: Check for nil valuestring for integer fields.Stig Bjørlykke1-1/+1
Added a check for nil valuestring for all ProtoField integer types to avoid lookup when argument is not set. Change-Id: Ib4c016b69ee77dbea4bb83ac93c0d9ae9f48f236 Reviewed-on: https://code.wireshark.org/review/11845 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit a8e774034b188662f29a41e3ff86ec96068bd025) Reviewed-on: https://code.wireshark.org/review/11846
2015-11-15Lua: Added support for ProtoField framenum type.Stig Bjørlykke5-7/+46
Change-Id: I1d4cddd4026f08416005f2b3212536b3984d1a8d Reviewed-on: https://code.wireshark.org/review/11834 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 e6b5f015e219f3968897adba0d6440945ff45b8e) Reviewed-on: https://code.wireshark.org/review/11844
2015-11-15udp: Don't mark zero checksum illegal when in_error_pkt.Stig Bjørlykke1-1/+1
A zero checksum is not illegal in IPv6/UDP when in a ICMPv6 packet. Change-Id: I07acc874d2385992089ef3ebc7a82e853904ecfc Ping-Bug: 6232 Reviewed-on: https://code.wireshark.org/review/11808 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 82bd3cc9eb49c886a1b6ff1ad0aa3be096bd8aec) Reviewed-on: https://code.wireshark.org/review/11843
2015-11-15[Automatic update for 2015-11-15]Gerald Combs17-4247/+4658
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icec0d139c9c72bfd56751f75e0ccca38eaa8d9c6 Reviewed-on: https://code.wireshark.org/review/11839 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-14Lua: Disallow ProtoField FRAMENUM to fetch from Tvb.Stig Bjørlykke1-0/+4
A ProtField type FRAMENUM cannot fetch value from a Tvb. Change-Id: Iff0f6df8b00445855c9030dcfa753daa62262171 Reviewed-on: https://code.wireshark.org/review/11832 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 13101020e12eb21e8464a3c4eb4fc2fe51409235) Reviewed-on: https://code.wireshark.org/review/11833
2015-11-14Qt: Fixed use-of-deallocated-memory when removing a profile.Stig Bjørlykke1-1/+2
The memory used for profile item data is accessed in updateWidgets() which is called when setting the Default profile as selected. Ensure we free this memory after this has happened. Bug: 11705 Change-Id: I79e12d918289e1fcf25331c39439e9c6f3b774d5 Reviewed-on: https://code.wireshark.org/review/11827 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 9196fa96edc467b04b68e845eb735c97ed3c8d3a) Reviewed-on: https://code.wireshark.org/review/11828
2015-11-14UDP Multicast Stats: Fixed typoUli Heilmeier1-2/+2
Change-Id: I98d6ef48448b32f57349facb2bbef538319c5da4 Reviewed-on: https://code.wireshark.org/review/11825 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 76dec3ba681da2c315efba4433d3b1f995defd91) Reviewed-on: https://code.wireshark.org/review/11826
2015-11-14p_mul: Fixed ack framenum links.Stig Bjørlykke1-3/+11
The ack symbol is for the Address PDU beeing acked. Also use the DUP_ACK symbol for P_Mul's Ack-Ack. Change-Id: I3da616e95e9c2cf889b1e4e4c0570ab0c276a2d2 Reviewed-on: https://code.wireshark.org/review/11819 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 20388ef1742efde4ba2bf5cf19814ac5192a6ffc) Reviewed-on: https://code.wireshark.org/review/11823 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-14dmp: Fixed ack framenum links.Stig Bjørlykke1-4/+16
The ack symbol is for the Message, Report or Notification beeing acked. Change-Id: I5ef99b9e7830f437278af18e681f8200fab6c3d4 Reviewed-on: https://code.wireshark.org/review/11818 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 2e19755c3343d0a58f3d43709df262e4a0d4d8fd) Reviewed-on: https://code.wireshark.org/review/11822 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-13Diameter: fix typo in dictionaryPascal Quantin1-1/+1
Change-Id: I164ce634536ec1a3de650d815e23cdd6102e2fde Reviewed-on: https://code.wireshark.org/review/11809 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit b776707af540d7431e815818e21ea1efac326d9f) Reviewed-on: https://code.wireshark.org/review/11810
2015-11-13CMake: add our own FindCygwin modulePascal Quantin2-0/+72
The one from official CMake (3.3.2) does not look for the default 64bits installation path. Let's add it. Also add a WIRESHARK_CYGWIN_INSTALL_PATH environment variable allowing to force it. For reference, registry based detection fails to detect a 64bits installation because it gets redirected to the Wow6432 node. Change-Id: If3172494e3ab232e094389b493e6b67023662ae5 Reviewed-on: https://code.wireshark.org/review/11769 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> (cherry picked from commit 654d4abf71ea2fd69eacce57dd970f93e2deab46) Reviewed-on: https://code.wireshark.org/review/11807
2015-11-13epan: Free cf->edt before free cf->epan when redissecting.Stig Bjørlykke1-0/+2
This because cf->edt->pi is pointing to data allocated in wmem_file_scope and epan_free() will free all data in wmem_file_scope. In Qt packet_list_clear() we check and use cf->edt, which will give a heap-use-after-free error. Change-Id: I97d532ba976b7bc5fe2995a224ca168edf3da38b Reviewed-on: https://code.wireshark.org/review/11803 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit da71ccbf778cca5d9c48e010597570a40fd190c0) Reviewed-on: https://code.wireshark.org/review/11806
2015-11-13Qt: Add go to next + previous packet in conversation.Gerald Combs4-1/+92
Add "Go→Next Packet in Conversation" and "Go→Previous Packet in Conversation" menu items. Make sure the shortucts ("Ctrl+." and "Ctrl+,") don't get switched to "Cmd+." and "Cmd+," on OS X. "Cmd+," is already taken by the preferences dialog. Change-Id: Iab9c7f60fdcf55f12c055b4d0948019bf667ebc9 Reviewed-on: https://code.wireshark.org/review/11771 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> (cherry picked from commit 661c9771f6ffeeda4b2ba278a9f15d1d14dbe525) Reviewed-on: https://code.wireshark.org/review/11800
2015-11-13Diameter dictionary updated.Branislav Makan1-9/+30
Added values for diameter AVP codes: 1085 Redirect-Information Grouped 1086 Redirect- Support Enumerated 1087 TDF-Information Grouped 1088 TDF-Application-Identifier OctetString 1089 TDF-Destination-Host DiameterIdentity 1090 TDF-Destination-Realm DiameterIdentity Change-Id: I8ba7a56a5a51b32a21a602751275e9ab254adbae Reviewed-on: https://code.wireshark.org/review/11802 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-13p_mul: Enhance ack framenum links.Stig Bjørlykke1-1/+1
Change-Id: I084b43fcd8419741c2de007bd03fc04532346813 Reviewed-on: https://code.wireshark.org/review/11797 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit acbf7d57253f4dc4206e3d67c0c56f6e28da6796) Reviewed-on: https://code.wireshark.org/review/11799
2015-11-13dmp: Enhance ack framenum links.Stig Bjørlykke1-1/+1
Change-Id: Iade2d06512bacbeff3e7446487a03d4f73dba721 Reviewed-on: https://code.wireshark.org/review/11796 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 89879ef9f9d1d89a3253b96c7c2b6ea606bbc851) Reviewed-on: https://code.wireshark.org/review/11798
2015-11-13[docsis] Support for Queue Depth-based Request FrameAdrianSimionov1-6/+37
Change-Id: Ieeb79e4e248bdd8ee239c003e41ede0955e1cf86 Reviewed-on: https://code.wireshark.org/review/11766 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 91290f7b6cf14dc3e40fc74712c212ae5eb75b7c) Reviewed-on: https://code.wireshark.org/review/11795
2015-11-13Diameter: Expand an error message.Gerald Combs1-2/+2
If we encounter the wrong ftype, print its name. Change-Id: I7405ccdd3e099f533c6a8aaf81b60faf4093741a Reviewed-on: https://code.wireshark.org/review/11790 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit b01cd398f9efdff485e1658265a1c2046d6c0b94) Reviewed-on: https://code.wireshark.org/review/11794
2015-11-13Qt: fix creation of a new profile broken by g328fbc0Pascal Quantin1-1/+3
Change-Id: Icbe8dbf6f0c4267d7ed4704f78e589a1a48e1424 Reviewed-on: https://code.wireshark.org/review/11783 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 aa94bbedfe92b040f528192dd66be085a1bbacc1) Reviewed-on: https://code.wireshark.org/review/11793
2015-11-13Qt: Fixed signal name to avoid a warning.Stig Bjørlykke2-16/+16
Also terminate stream lines with endl. Change-Id: Icbbe5b47695506888c03607ff0af66c59306faae Reviewed-on: https://code.wireshark.org/review/11778 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 1b6bf766046aca882deb7f1b9f30f25ffcb3636a) Reviewed-on: https://code.wireshark.org/review/11792
2015-11-13Qt: Coloring Rules dialog fixups.Gerald Combs4-9/+22
Insert new rules at the top. This matches the GTK+ UI behavior. Recolor the packet list when we press "OK". Add a "to do" item about setting the filter column width. Change-Id: I2a9e58fe8642a89f12e1c34622b96613f3ec4c05 Reviewed-on: https://code.wireshark.org/review/11781 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 f5d7548497eb63ebe010e5199038ef2300bf95aa) Reviewed-on: https://code.wireshark.org/review/11791
2015-11-13Qt: fix UI artifacts seen in UAT window on Linux or OSXPascal Quantin1-0/+3
The QLabel::clear() method call does not seem to repaint the area on those platforms. Let's force an update of the widget. Bug: 11695 Change-Id: I9c708c8537140b26582e4365ceee3271eac23259 Reviewed-on: https://code.wireshark.org/review/11782 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 9fe7102b3a1bc72ac9921019938be71312b26b78) Reviewed-on: https://code.wireshark.org/review/11789 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-12Developer guide: add docbook-xml45 to the list of required Cygwin packagesPascal Quantin1-1/+3
Change-Id: Id0a241361160b03c16a6a9152c8f1a86f87b9db1 Reviewed-on: https://code.wireshark.org/review/11784 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 7775b4898780299652ceab10d8022d9df683c723) Reviewed-on: https://code.wireshark.org/review/11785
2015-11-12Fix installation of desktop files.Guy Harris1-1/+1
Change-Id: I33ed9741db9a50098b8c7c85409f3e6a0c2e2f15 Reviewed-on: https://code.wireshark.org/review/11772 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit db02f99fdb6bbeb7ad872bbf836138ca3992ae7a) Reviewed-on: https://code.wireshark.org/review/11773
2015-11-12Qt: initialize all remote interface optionsPascal Quantin1-0/+8
Bug: 11699 Bug: 11701 Change-Id: Ib470e69bba015a006f9360cfdb429a816b80e37c Reviewed-on: https://code.wireshark.org/review/11767 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 2ff3c750e9a01248dcc038ca1c45df91625ab52d) Reviewed-on: https://code.wireshark.org/review/11768
2015-11-12[IMF] Add bounds checks to avoid buffer overruns,DiablosOffens1-4/+13
also sets the last_field flag to true if it's the end of the buffer. Change-Id: I135d052fce04807ce61b5feb9af121ff4528f595 Reviewed-on: https://code.wireshark.org/review/11731 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 56c1e80508f73b244c12b537223e777a253395f7) Reviewed-on: https://code.wireshark.org/review/11765
2015-11-12Fix up documentation of RPM packages.Jeff Morriss3-12/+43
Specify which ./configure options are passed into the RPM. Describe the 3 package RPM package names and their contents. Describe how to enable parallel builds when making RPMs. RPM now stands for "RPM Package Manager." Fix some markup problems. Change-Id: I1664aa0956719e872d302a4af2c092318f5eea6d Reviewed-on: https://code.wireshark.org/review/11737 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 1ab019f409f2855d3b51717a237cc482242887e9) Reviewed-on: https://code.wireshark.org/review/11761
2015-11-12Qt: save preferences after creating a filter from expression framePascal Quantin1-0/+2
Bug: 11690 Change-Id: Ice6a2341d3f39c107a3c9d6a0e23fd98312b48a8 Reviewed-on: https://code.wireshark.org/review/11748 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 c712d65e919cea6fde7b95ffd4a821c137d84703) Reviewed-on: https://code.wireshark.org/review/11760
2015-11-12Qt: Added IO Graph save to clipboard button.Stig Bjørlykke2-5/+72
Also added save as CSV file. Do not add double quotes for values as we do in GTK. Change-Id: I8576a73e10b71cdba0c8c80db8b21927d19528da Reviewed-on: https://code.wireshark.org/review/11732 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 864872ed618e3c2853728f872cce6cf6282c617d) Reviewed-on: https://code.wireshark.org/review/11759
2015-11-12Use format_text() when displaying, not when handing to AirPDcap.Guy Harris1-16/+56
format_text() is specifically intended to handle strings when displaying them to the user; code such as AirPDCap, which doesn't display strings to the user, should be handed the raw SSID. Put in a comment indicating what we probably *should* be doing here. Bug: 11685 Change-Id: Ic30114c35d1d8f3d791ae904e33a4d81ddc215ec Reviewed-on: https://code.wireshark.org/review/11757 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e240ad882bc1e133e76b8308a76884d12b265253) Reviewed-on: https://code.wireshark.org/review/11758
2015-11-12802.11: avoid multi return on SSID or MESHIDAlexis La Goutte1-5/+5
Bug:11685 Change-Id: Ibe7a2909f0aed33fa35685ac5c8e0e1a8a626742 Reviewed-on: https://code.wireshark.org/review/11652 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 50e83c0e79efe69eb71a6645b67e761e263e44d6) Reviewed-on: https://code.wireshark.org/review/11756
2015-11-12Export functions str_to_ip() and str_to_ip6() to pluginsJo Rueschel1-0/+3
The functions str_to_ip() and str_to_ip6() are not yet exposed to plugins so they cannot be used there. Now they are added to the plugin API. Change-Id: I9df267934ad43887a6326c8c9a1a666f263c08a2 Reviewed-on: https://code.wireshark.org/review/11728 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 09f43c196e2c642e736b77f0a0fec924be096b7d) Reviewed-on: https://code.wireshark.org/review/11755
2015-11-12Plug file descriptor leak.Guy Harris1-0/+1
Change-Id: I882cc5c264fdf97452c84bd5cea0e5d56bd6eb45 Reviewed-on: https://code.wireshark.org/review/11753 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 412ab838d2866e74c64a79b5a8959d85dc35a6f3) Reviewed-on: https://code.wireshark.org/review/11754
2015-11-12Add wtap_dump_open_tempfile routines, to write to a temporary file.Guy Harris5-25/+106
It includes the temporary-file generation, so you don't have to do it yourself. Change-Id: I0798df95a5c5646224ec49612f50b423ed78547a Reviewed-on: https://code.wireshark.org/review/11751 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 75dc2051e861294a0e75955e896de7494f086b42) Reviewed-on: https://code.wireshark.org/review/11752
2015-11-122.0.0rc3 → 2.0.0rc4.Gerald Combs1-6/+6
Change-Id: I15153b2ee5e584a48a52bf852610da1831a5b1af Reviewed-on: https://code.wireshark.org/review/11750 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-11Build 2.0.0rc3.Gerald Combs4-2106/+1164
Change-Id: Iec66588cb40caba2ed35f8720b124a02e3137c8b Reviewed-on: https://code.wireshark.org/review/11747 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-11Qt: fix cursor position when editing coloring rules names or filtersPascal Quantin2-12/+0
A call to setText will set the cursor to the end of the box. As far as I can tell, this call is useless so let's remove it. Bug: 11689 Change-Id: I40aee48745a9107331a017070a715a075106974a Reviewed-on: https://code.wireshark.org/review/11727 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit ca2ecc124144dfd7273213232b585808dc8a06a5) Reviewed-on: https://code.wireshark.org/review/11746
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-01 15:46:49 +0000