aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte525-1051/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-03Create/use an extended value-string; Move value-string array from .h file; ↵Bill Meier1-2/+2
Do other misc. - Value string arrrays should never be defined in a .h file (especially one included in multiple .c files). So: a. The value_string array (and associated #defines) was moved from the .h file to packet-rtp_events.c b. A public extended value_string was created in packet-rtp_events.c and declared as external in packet-rtp_events.h - Other: Remove a few unneeded initializers; Add editor modelines. Change-Id: Ib580c3e50ab5ce79484c9c6af57f62ca604b57d1 Reviewed-on: https://code.wireshark.org/review/468 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02Scan-build didn't like the fixes in g79ef36a5f.Gerald Combs1-5/+6
Change-Id: I1083136f9e4fb38b55e9b9c2fec74ddec35f198e Reviewed-on: https://code.wireshark.org/review/452 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-02Fix ui/iface_lists.c - type attribute is not copiedRoland Knall1-0/+1
temp is a clone of the local if_info, but the type attribute is not copied correctly Additionally, the if_type member is exposed via the capture options Change-Id: Id53f0dfd1e127921e1b89bbf78cb431ee257a96c Reviewed-on: https://code.wireshark.org/review/404 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-01Fix some scan-build warnings.Gerald Combs4-4/+5
Fix a modeline while we're at it. Change-Id: Ief6d5edbe33456170059cfab4f436f0844de32a1 Reviewed-on: https://code.wireshark.org/review/440 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25Get Windows build working again.Gerald Combs2-2/+3
Change 16 / g579e7e1 introduced a breaking change in capture_file_dialog.cpp on Windows. This works around the problem temporarily until we come up with a proper fix. Fix a Q_OS_WIN check while we're at it. Change-Id: I552d60720e4a45c5144e0047ee3c1fcc7e64f4eb Reviewed-on: https://code.wireshark.org/review/396 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25Remove trailing whitespaceBill Meier83-214/+214
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25Use correct macro to really fix MacOSX buildbotEvan Huus1-3/+3
Change-Id: Ibb7b13c0c9c5699642cda48522b34ace34c28b46 Reviewed-on: https://code.wireshark.org/review/377 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25Include old-gtk-compat.h to fix build.Evan Huus1-0/+1
Change-Id: I3614e11fb0e76625b2b9686be423bf421c295e6f Reviewed-on: https://code.wireshark.org/review/376 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25Wireshark: Add option to choose format type of capture fileMichal Labedzki14-22/+63
The best heuristic can fail, so add possibility to manually choose capture file format type, so not correctly recognize file format can be loaded in Wireshark. On the other side now it is possible to open capture file as file format to be dissected. Change-Id: I5a9f662b32ff7e042f753a92eaaa86c6e41f400a Reviewed-on: https://code.wireshark.org/review/16 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-02-24Fix Called C++ object pointer is null found by ClangAlexis La Goutte1-1/+1
Change-Id: I2263b4ac16945be6d87eaa8c963f7b03e437d724 Reviewed-on: https://code.wireshark.org/review/319 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20Limit the range to the TSNs provided.Irene Rüngeler1-4/+6
Change-Id: Ibf72fb60d06baa7a9590a303f2e10e5a86c61093 Reviewed-on: https://code.wireshark.org/review/254 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-02-18Fix Branch condition evaluates to a garbage value found by Clang AnalyzerAlexis La Goutte1-0/+4
Change-Id: I745f838a763e5cc89e1b9c0536ad3cb299b00786 Reviewed-on: https://code.wireshark.org/review/245 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18Add Logcat to Exported PDUMichal Labedzki1-0/+1
Logcat can be exported from ADB over USB or ADB over TCP where can occur multiple Logcat PDUs in one frame. Change-Id: I290fa131e5600c62357e5be4e76096ea5c35364b Reviewed-on: https://code.wireshark.org/review/234 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-17<Ctrl>R to restart does not work [Wireshark Qt]Alexis La Goutte2-9/+11
From me : Add reload action Change-Id: Ic47e3ff1ae0c1cc0ae8c40e5019dea9906612f90 Partial-Bug: 9003 Reviewed-on: https://code.wireshark.org/review/238 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17On 'You have unsaved packets' dialog, expected D or <Alt>D to use as ↵Alexis La Goutte1-2/+4
accelerator to discard and S or <Alt>S of save [Wireshark Qt]. From me : Add window title and fix missing text (Do you want to ....) Change-Id: I1448d7b85ad9490a92dac7e89d9fd2fdb51a145e Partial-Bug: 9003 Reviewed-on: https://code.wireshark.org/review/239 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17Menu cannot be reached using accelerators, for example <Alt-F> does not open ↵Alexis La Goutte1-0/+5
File [Wireshark Qt]. Change-Id: I8a67d435510d5604bb501872f264cce4ba23595d Partial-Bug: 9003 Reviewed-on: https://code.wireshark.org/review/237 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-16Stack overflow after selecting data when filter is applied that has no ↵Alexis La Goutte1-1/+1
results (Wireshark Qt) Fix 0x00000000004a480e in PacketList::contextMenuEvent (this=0xbbb460, event=0x7fffffffd270) at ui/qt/packet_list.cpp:485 485 if (cap_file_->edt->pi.ipproto == IP_PROTO_SCTP) Closed-bug : 9769 Change-Id: I1a657d7208a10c829b2dfe90abb168eff93cd268 Reviewed-on: https://code.wireshark.org/review/224 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-16Add explicit casts to fix OSX10.5 BuildbotEvan Huus2-16/+16
Change-Id: I13fa3d6af3d0fddc367835fc05efdbe106b991e6 Reviewed-on: https://code.wireshark.org/review/228 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-16Replace last use of emem trees with GHashTablesEvan Huus2-85/+100
Change-Id: I1cedc611c9b7888eb671cf858c6f7819d37afba9 Reviewed-on: https://code.wireshark.org/review/219 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-02-13About box: make sure we read AUTHORS-SHORT as UTF-8.Gerald Combs1-0/+5
Use the application monospace font for the "Authors" and "License" tabs similar to the GTK+ UI. Change-Id: Ibca481562d7a9957ce603441c1e98b564e5bf389 Reviewed-on: https://code.wireshark.org/review/194 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-12RTP: Add support for SBC codec in RTP PlayerMichal Labedzki1-98/+82
Add optional dependancy to libsbc to play Bluetooth SBC in A2DP payload. Also simplify RTP Player and extent codec interface. Change-Id: I52e1fce9c82e2885736354fe73c6c37168a4fda3 Reviewed-on: https://code.wireshark.org/review/19 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-11Fix a Qt version comparison.Gerald Combs1-2/+2
Change-Id: I7df90d53a2d8f29042994bd0c2bc7bf4450fab10 Reviewed-on: https://code.wireshark.org/review/177 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Statistics->Flow Graph in qtshark crashes with a segfaultDavid Ameiss1-5/+10
What appears to be happening is SequenceDiagram::draw() is iterating over the stored seq_analysis_item_t elements - but at the same time SequenceDialog::fillDiagram() is running - which destroys the old seq_analysis_info_t (which SequenceDiagram has stored a copy of and is referencing items in the list) then reloads it. I'll attach a patch to SequenceDialog::fillDiagram() which fixes the problem - essentially calling sequence_analysis_list_get() with a new seq_analysis_info_t, calling SequenceDialog::setData() with the new one, then destroying the current seq_analysis_info_t and replacing it with the new on Change-Id: I14f7b5dc64018ba5b81fe8d874a701e021401859 Closed-bug:9506 Reviewed-on: https://code.wireshark.org/review/175 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10Qt 5.2.1 for Mac has QtMacExtras but not QMacNativeToolBar.Gerald Combs1-2/+2
Change-Id: I55e68a7fd84d36b50e6084cd82b51df7c91c6476 Reviewed-on: https://code.wireshark.org/review/159 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs11-17/+17
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-03Fix all -fstrict-alias warnings found by gcc 4.1.2Gilbert Ramirez1-1/+1
The majority of the fixes are for calls to uat_new(). Instead of having each caller cast its private data to (void**), we use void* in the uat_new() API itself. Inside uat_new(), we cast the void* to void**. Some dissectors use val64_string arrays, so a VALS64() macro was added for those, to avoid using VALS(), which is useful only for value_string arrays. packet-mq.c was changed because dissect_nt_sid() requires a char**, not a guint**. All other callers of dissect_nt_sid() use char*'s (and take the address of it) for their local storage. So, this was changed to follow the other practices. A confusion between gint and absolute_time_display_e in packet-time.c was cleared up. The ugliest fix is the addition of ip6_guint8_to_str(), for exactly one caller. The caller uses one type of ip6 address byte array, while ip6_to_str() expects another. This new function is in place until the various address implementations can be consolidated. Add VALS64() to the developer documentation. Change-Id: If93ff5c6c8c7cc3c9510d7fb78fa9108e4552805 Reviewed-on: https://code.wireshark.org/review/48 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-29Merge "Apply layouts in Qt Creator. Fix a tooltip."Alexis La Goutte1-229/+211
2014-01-26lupdate / lrelease ui/qt/Qtshark.proAlexis La Goutte7-843/+16790
svn path=/trunk/; revision=54968
2014-01-26Drop support of Visual Studio 2005Alexis La Goutte3-17/+0
* Remove _MSC_VER < 1500 check * Cleanup config.nmake See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html svn path=/trunk/; revision=54965
2014-01-26Fix indent (Use 4 spaces) and add modelinesAlexis La Goutte2-70/+96
svn path=/trunk/; revision=54964
2014-01-22Clean up whitespace: use consistent indentation, etc;Bill Meier1-46/+59
Add editor modelines. svn path=/trunk/; revision=54883
2014-01-20Add modelines infoAlexis La Goutte1-1/+13
svn path=/trunk/; revision=54855
2014-01-20Fix indent (use 4 spaces) and remove trailing whitespaceAlexis La Goutte1-3/+3
svn path=/trunk/; revision=54854
2014-01-20Fix build with CMake (Missing tap_export_pdu in ui/CMakeLists.txtAlexis La Goutte1-1/+2
svn path=/trunk/; revision=54853
2014-01-20Fix typo (only need one comma)Alexis La Goutte1-1/+1
svn path=/trunk/; revision=54852
2014-01-20Split the GUI and the tap part to make it possible to adapt to Qt.Anders Broman6-213/+306
svn path=/trunk/; revision=54850
2014-01-17Fix [-Wmissing-prototypes]Anders Broman23-0/+44
svn path=/trunk/; revision=54834
2014-01-17Fix [-Wmissing-prototypes]Anders Broman28-0/+49
svn path=/trunk/; revision=54833
2014-01-17Apply layouts in Qt Creator. Fix a tooltip.Gerald Combs1-229/+211
Change-Id: I02759cb83ef970395a80acaafb9a28c630000000
2014-01-16Fix [-Wmissing-prototypes]Anders Broman15-1/+28
svn path=/trunk/; revision=54826
2014-01-15Don't cast away constness.Guy Harris1-1/+1
svn path=/trunk/; revision=54818
2014-01-14Fix typo (Direcly => Directly)Alexis La Goutte1-2/+2
svn path=/trunk/; revision=54804
2014-01-14In a source file that defines external functions, the header file thatGuy Harris1-1/+3
declares the functions must be included, in order to make sure the declarations match the function signature. Make it so. Don't cast away constness when passing something to a routine that takes a const pointer argument. svn path=/trunk/; revision=54747
2014-01-14Make a routine not used outside this file static.Guy Harris1-3/+3
svn path=/trunk/; revision=54746
2014-01-14In a source file that defines external functions, the header file thatGuy Harris1-0/+2
declares the functions must be included, in order to make sure the declarations match the function signature. Make it so. svn path=/trunk/; revision=54745
2014-01-14Include ui/progress_dlg.h to get the declaration ofGuy Harris1-0/+2
delayed_create_progress_dlg(). svn path=/trunk/; revision=54744
2014-01-14#if 0 out an unused routine.Guy Harris1-0/+2
svn path=/trunk/; revision=54743
2014-01-14In a source file that defines external functions, the header file thatGuy Harris1-0/+2
declares the functions must be included, in order to make sure the declarations match the function signature. Make it so. svn path=/trunk/; revision=54742
2014-01-14Make a routine used only in this file static.Guy Harris1-1/+1
svn path=/trunk/; revision=54741