aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-27wslua: do not free TVB for data sourcesPeter Wu1-2/+2
Bug: 12050 Change-Id: If094f78f683776ba2ea3ddd848ec9018cba064b8 Reviewed-on: https://code.wireshark.org/review/13554 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-27ssl: enable "decryption" without keys for NULL ciphersPeter Wu1-9/+39
NULL ciphers have their content in plaintext which can be dissected. When the keys are available, decryption and MAC validation works as usual. When the master secret cannot be found, continue anyway in case of NULL ciphers. Change-Id: I1ba6de6333fad58cabc757544490cddca7d82e26 Ping-Bug: 4652 Reviewed-on: https://code.wireshark.org/review/13536 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-27Remove the deprecated column types so users don't think they still exist.Michael Mann5-245/+202
Bug: 11559 Change-Id: I51836dc9a4fa399835c7bdabcba577ebd40327ad Reviewed-on: https://code.wireshark.org/review/13538 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>
2016-01-27vuze-dht: show network coordinates instead of binary dataДмитрий Цветцих1-5/+63
Vuze used Vivaldi. It is decentralized network coordinate system. Vivaldi contains 3 coordinates of an Euclidean space + 1 coordinate of predicted error. Change-Id: I8c4b4d64534675d1dfb9d35a03a61d2336fc0e6d Reviewed-on: https://code.wireshark.org/review/13547 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>
2016-01-27Don't treat Visual Studio specially for linker flags.Guy Harris2-29/+27
Have CHECK_C_LINKER_FLAG pass /WX to the linker if we're using MSVC, to force the link to fail if the linker doesn't recognize the flag. Add flags to WIRESHARK_LD_FLAGS even with MSVC; let CHECK_C_LINKER_FLAG figure out whether the flag should be used. While we're at it, fix CHECK_C_LINKER_FLAG to save and restore CMAKE_REQUIRED_LIBRARIES. Change-Id: I7f73b4cc3a28eb14e46c2e1e9ad69f5303754f01 Reviewed-on: https://code.wireshark.org/review/13558 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-27CIP: Add support for all defined segment typesD. Ulis2-58/+546
Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-27Explain why we're still checking for MSVC.Guy Harris1-1/+10
Change-Id: I7d656eb5b38e8f7697b1414b6b3364a85ad132cf Reviewed-on: https://code.wireshark.org/review/13557 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-27Make CHECK_C_LINKER_FLAG work with, at least, the Xcode generator.Guy Harris1-4/+21
As per a suggestion from a Kitware person in bug 0015934: https://cmake.org/Bug/view.php?id=15934 We also don't need to check whether the resulting code *runs* - check_c_source_compiles not only compiles, it links as well. Change-Id: Ied09b9da7c88ac46f14df14f6a6260037abdbef4 Reviewed-on: https://code.wireshark.org/review/13556 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-26CMake: docs updateGraham Bloice1-4/+6
Small amendments to README.cmake Change-Id: I854baac2ce5b3ac1cd3c578d1bc976195599c9c4 Reviewed-on: https://code.wireshark.org/review/13555 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-01-26wslua: fix memleak on error path of Tvb:bytes()Peter Wu1-5/+6
Delay allocation of a GByteArray to avoid a memleak on errors. Change-Id: I2b2ae6d33407500e81a4f45b86ef82720d3443a4 Reviewed-on: https://code.wireshark.org/review/13553 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-01-26Qt: Check for file changes on ReloadStig Bjørlykke3-5/+27
Check if having unsaved changes and offer a save before reload and reload as file format/capture. Bug: 12003 Change-Id: Ic4282e0a17a4ec745e729eb93863fc15e7ec611b Reviewed-on: https://code.wireshark.org/review/13535 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> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-26Qt: Improved testCaptureFileClose dialog textsStig Bjørlykke3-68/+54
Make the "Unsaved packets" dialog question and informative text use the same layout for all cases. Added before_what texts when opening another file and closing the file. Changed the texts for restarting the capture. Renamed FileCloseButtons to FileCloseContext to use it for other checks than just button texts. Change-Id: I4a39852a1c18e8ffb7fa6b5c800a84500f995bc8 Reviewed-on: https://code.wireshark.org/review/13524 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-26prefutils: Add convenience functionRoland Knall2-2/+61
This is a convenience function for allowing multiple key/values to be saved to the preference system, without having to reference pref_t or the real underlying value. It is used by the extcap save functionality, to store the saved values Change-Id: I1c8bf787db8ed2d17628024ec1cd19073e49d017 Reviewed-on: https://code.wireshark.org/review/13471 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-01-26Qt: Detect language on Windows and load qt_xx.qm/qt_xx_XX.qmUli Heilmeier1-1/+7
Sytem language is reported as xx_XX (e.g. de_DE). As we're only shipping qt_xx.qm in the Windows installer the langfile is missing. This commits searches for qt_xx_XX.qm and qt_xx.qm files and loads it. See also https://wiki.qt.io/How_to_create_a_multi_language_application Furthermore it fixs commit 137dba6e66f58c0dae371e7fb98d3fdd6dc8c1f4 to load qt_xx.qm in the right way. Change-Id: Iba9e597a44eb42b867542d1d6ffccc55f824bbe1 Reviewed-on: https://code.wireshark.org/review/13525 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>
2016-01-26PDCP LTE: upgrade dissector to v13.0.0Pascal Quantin5-27/+128
Change-Id: Iae4a38ac7b80978d1ad02168e79c0fe0bffd8d2e Reviewed-on: https://code.wireshark.org/review/13549 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>
2016-01-26color_filter(.h): Fix The following parameters of ... are not documentedAlexis La Goutte1-0/+4
Part 2 (oups forget to save before commit) Change-Id: I186596d6c6e3838fc86794638f50f115b270d230 Reviewed-on: https://code.wireshark.org/review/13548 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>
2016-01-26capture(.h): fix api referenceAlexis La Goutte1-0/+1
The following parameters of capture_start(capture_options *capture_opts, capture_session *cap_session, info_data_t *cap_data, void(*update_cb)(void)) are not documented: parameter 'cap_data' Change-Id: I5953b35155de49ead64be263b32da2aa671f2206 Reviewed-on: https://code.wireshark.org/review/13546 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-26capture_sync(.h): fix api referenceAlexis La Goutte1-0/+1
The following parameters of sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, struct _info_data *cap_data, void(*update_cb)(void)) are not documented: parameter 'cap_data' Change-Id: I3733c51eddbe94e9c0d680dd8436265b7878d70c Reviewed-on: https://code.wireshark.org/review/13545 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-26cell_broadcast(.h): fix api referenceAlexis La Goutte1-0/+1
The following parameters of dissect_umts_cell_broadcast_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) are not documented: parameter 'data' Change-Id: I4cd2a41f62ca99fc7aaa5d95049abd5662e50940 Reviewed-on: https://code.wireshark.org/review/13544 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-26color_filter(.h): Fix The following parameters of ... are not documented:Alexis La Goutte1-0/+5
parameter 'err_msg' or parameter 'add_cb' Change-Id: Iea43833de7bbb12ce16c3363d26f70a2859e092c Reviewed-on: https://code.wireshark.org/review/13543 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-26api ref (wmem_interval_tree): fix end of file while inside a groupAlexis La Goutte1-0/+3
Change-Id: I68fbe85a8a7e3f0181fc84151fa8f58c459fd46a Reviewed-on: https://code.wireshark.org/review/13542 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-26Change filter button label in qt follow window to 'Filter Out This Stream' ↵David Morsberger1-1/+1
to match label in gtk version. Change required because functionality is now the same between two windowing systems (Hide vs. Filter) Change-Id: Iec321c93cfe8eefe15bb287ea3267956146255c7 Reviewed-on: https://code.wireshark.org/review/13321 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-26RADIUS: Add new HP AttributeAlexis La Goutte1-0/+4
from Aruba ClearPass 6.5.5 HP-Port-Bounce-Host (attribute id 23) and HP-Captive-Portal-URL (attribute id 24) Change-Id: I5b0646344dad4da00bb298eb1f989e76bc27db6f Reviewed-on: https://code.wireshark.org/review/13541 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-26RADIUS: resync HP DictionaryAlexis La Goutte1-1/+2
Fix typo on wiki URL Change-Id: Iac6203ca5fb1390b37ce9c8932661a3609ed4bc8 Reviewed-on: https://code.wireshark.org/review/13540 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-25dns,spdy,ssl-utils: fix export PDUPeter Wu3-21/+15
Dissectors registered with SSL must be registered for Export PDU to work properly. Otherwise the dissector name could be NULL, resulting in a capture file that cannot properly be dissected. Add an assertion to ssl-utils to catch this situation. Note that this results in an "wmem_alloc: assertion failed: (allocator->in_scope)" report because these functions are possibly called in the protocol handoff routines... Can be fixed later. The DNS dissector is fixed by merging the UDP/TCP dissectors into a single dns handle which recognizes TCP and then assumes the length prefix if TCP. Change-Id: If73b9b09a4682d66fb8fa026c42a3475648f9bf1 Reviewed-on: https://code.wireshark.org/review/13194 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: Anders Broman <a.broman58@gmail.com>
2016-01-25ssl: fix RSA key matching with Client certsPeter Wu1-1/+1
Avoid a RSA private key lookup for client certificates, the RSA private key is only valid for the server certificate. The lookup based on the client cert resulted in overwriting the server match. Bug: 12042 Change-Id: I60aa79f8f2b941bfde032e20ab11446ae4e6c81b Reviewed-on: https://code.wireshark.org/review/13530 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-01-25phdr->pkt_encap and phdr->pkt_tsprec need to be set for seek-read too.Guy Harris1-0/+13
We set them to the file's values in wtap_read(), but we weren't setting them in wtap_seek_read(); set them in both places. Change-Id: Id604b1c7d27d4cee6600249e9435c49d02f8dd61 Reviewed-on: https://code.wireshark.org/review/13531 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-25TDMoP Dont register UDP port 0 or Ethertype 0.AndersBroman1-4/+12
Change-Id: I7e724a6390fbe75993c8663c8c43937a40d8250d Reviewed-on: https://code.wireshark.org/review/13528 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-25Fix missing validation (crash) for certain prefsPeter Wu1-11/+33
The gui.layout_type preference is part of the Layout submodule (which is part of the gui module. The Layout submodule has a special apply callback that validates its prefs. These validations were never called though because the prefix is "gui" and as a result that module would be marked as changed. Fix this crash by calling the validation function on the submodules instead holding the pref, not its parent. Change-Id: I2a49dce93fdc7fab4ab3dc52dad90288c2d17434 Reviewed-on: https://code.wireshark.org/review/13154 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-01-25[skinny] pinfo->fd-num changed to pinfo->numAndersBroman1-2/+2
Change-Id: Icf512fb1d4a211632fc307434f9036b68bb0b8cb Reviewed-on: https://code.wireshark.org/review/13527 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-25Qt: Fix checkSaveAsWithComments() button checkStig Bjørlykke1-26/+25
When using QMessageBox with custom buttons, exec() function returns an opaque value. Therefore we should use clickedButton() to determine which button was clicked. Example in https://wiki.qt.io/Custom_QMessageBox_Buttons Change-Id: I81824414e31345bb9ea77f72f1b4cdeaa21d2781 Reviewed-on: https://code.wireshark.org/review/13523 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>
2016-01-25MAC LTE: upgrade dissector to v13.0.0Pascal Quantin2-97/+424
Change-Id: I1a0e575acc83b88d595111809ca03e4bdf479619 Reviewed-on: https://code.wireshark.org/review/13516 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>
2016-01-25Move the proto data stuff out of frame_data.[ch].Guy Harris149-206/+494
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-25Add a missing function.Guy Harris1-0/+1
Change-Id: I38d3cc6082436299706c34439b6bc212a9ec5d29 Reviewed-on: https://code.wireshark.org/review/13520 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-25Add some missing symbols.Guy Harris1-0/+2
Change-Id: I2229fb666a838b9d74f70270cbad548ea28dffd2 Reviewed-on: https://code.wireshark.org/review/13519 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Update Lua tests after g9eda2faPascal Quantin1-6/+6
Change-Id: I3e9849afc8df9d81d0d9e0a4eaa9800d9c1ce8ec Reviewed-on: https://code.wireshark.org/review/13517 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-24Fix reassembly test broken by gbc5a037Pascal Quantin1-2/+2
Change-Id: I8bcde5fd5039b77eccd9327cb7f0558b4fdedc36 Reviewed-on: https://code.wireshark.org/review/13515 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-24[Automatic update for 2016-01-24]Gerald Combs16-1763/+2081
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Iaac61b4a2f446b99d4600ae8ae56405ae6fb21da Reviewed-on: https://code.wireshark.org/review/13512 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-24More pinfo->fd->abs_ts to pinfo->abs_ts.Guy Harris1-4/+4
Change-Id: I15a187fd0e85ba41431ebbcf88168fca79b624cd Reviewed-on: https://code.wireshark.org/review/13511 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24More pinfo->fd->num to pinfo->num.Guy Harris3-40/+40
Change-Id: Ic56b1e9be4886be9985c4b7082fbd330dbf297df Reviewed-on: https://code.wireshark.org/review/13510 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris335-1913/+1914
That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Allow hex and octal values to be used in rangesAdam Goldman1-2/+2
Change-Id: I896b945067c4325a29c41c23ad39486e356d9434 Reviewed-on: https://code.wireshark.org/review/13474 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>
2016-01-24Indicate what an InterfaceTree is.Guy Harris2-0/+4
(I.e., it's just names, traffic sparklines, and, if available, extcap options; it's not the more detailed list of capture options seen elsewhere.) Change-Id: I21cc244ae17abab95f8124e39425e8beae564380 Reviewed-on: https://code.wireshark.org/review/13507 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Qt io_graph: Use Interval value when generating Y-axis label or legendJim Young3-9/+87
The I/O Graph allows the user to choose from several different Y-axis units. Three of the selectable Y-axis units unconditionally imply a per-second time unit (/s) regardless of the actual I/O Graph Interval value selected. In addition the Y-axis label includes the “/s” as a suffix regardless of the current Interval value. This patch removes "/s" suffix from the Y-axis pick-list units. This patch also dynamically adds the selected Interval value to the Y-Axis label or alternatively as the first line of the legend box that is displayed if the various enabled graphs have differing Y-axis values. For readability the pick-list values for sub-second Interval values are changed to 1 ms, 10 ms and 100 ms from the original pick-list values of 0.001 sec, 0.01 sec and 0.1 sec respectively. To support adding a “Title” to the legend, the QCustomPlot widget is augmented with “Legend Title” source authored by “David” as posted at: http://www.qcustomplot.com/index.php/support/forum/443 Note: This patch changes the valid Y-axis unit values stored within the io_graphs preferences files. Any io_graphs files having entries with the now obsolete Y-Axis values of “Packets/s”, “Bytes/s” or “Bits/s“ will be silently upgraded to “Packets”, "Bytes" and "Bits" respectively when saved. Bug: 11855 Change-Id: I503ff6dc20b09d90f087342084fb0db6e0080c7f Reviewed-on: https://code.wireshark.org/review/12219 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-24Set width of hex output according to bitmaskKevin Bracey4-71/+106
Output from BASE_HEX et al has always been zero-padded to according to the field type - 8 digits for FT_UINT32, etc. When the field has a bitmask, this is definitely not appropriate - the field type is used to indicate the size of the bitfield container, and tells us nothing about the size of this field. Instead, determine the actual size of the field by inspecting the bitmask, and output the corresponding number of hex digits. Change-Id: I10ec4e93e1e40e8b1354d5368cc8945cf671a617 Reviewed-on: https://code.wireshark.org/review/13225 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-24Qt: Load qt_XX.qm to translate Qt StringsUli Heilmeier1-0/+4
The Windows installation includes the Qt translations files qt_XX.qm in the installation directory (e.g. C:\Program Files\Wireshark\). However we've tried to load the files only from the QLibraryInfo::TranslationsPath (C:\Qt\5.3\msvc2013_64_opengl\translations\). This path is missing in a normal Windows environment. Therefore strings like "Ctrl" haven't been translated. Change-Id: I45bc873fdd95fd0ab5c79e70d9ff062274f899fe Reviewed-on: https://code.wireshark.org/review/13485 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>
2016-01-23ui: Code cleanupStig Bjørlykke27-231/+192
Fixed code layout to use common style in the file. Mostly whitespace changes. Change-Id: Id37b57717a9e26248fad07322dff09b1d1f45ac2 Reviewed-on: https://code.wireshark.org/review/13504 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>
2016-01-23ANSI A: get rid of a global bufferPascal Quantin1-29/+26
Change-Id: Iba66af0b3dca683c3f9cf5497ddda46469cd4695 Reviewed-on: https://code.wireshark.org/review/13506 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>
2016-01-23CMake: Produce correct plugindir for pkg-configMichal Privoznik1-1/+1
So far the plugindir variable in the pkg-config file is set like this: set( plugindir "\${libdir}/${PLUGIN_INSTALL_DIR}" ) where libdir is set to: set( libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}" ) However, PLUGIN_INSTALL_DIR already contains CMAKE_INSTALL_LIBDIR: set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/\ ${CPACK_PACKAGE_NAME}/plugins/${CPACK_PACKAGE_VERSION}") Therefore, if the pkg-config file is generated by cmake, the resulting plugindir points to: plugindir=${libdir}/lib/wireshark/plugins/2.1.0 libdir=${exec_prefix}/lib This is obviously wrong as after variable substitution the resulting path is /usr/lib/lib/wireshark/plugins/... Change-Id: I448991284d8948434311b1c0828828fd93d0baf8 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-on: https://code.wireshark.org/review/13258 Tested-by: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-23More structure assignments for nstime_t.Guy Harris3-10/+5
Change-Id: I4d320b50d7d74b6fc423014c9611a60d49c6be02 Reviewed-on: https://code.wireshark.org/review/13503 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 02:51:21 +0000