Commit Graph

2431 Commits

Author SHA1 Message Date
Hadriel Kaplan 041f844d72 Add command-line arg for input file format for tshark/wireshark
Now that we have the ability to choose input file format type
in the GUI, we might as well have it in the command-line too.
Plus it would help me in test-stuies if we had a commandline.
So I've added a '-X read_format:Foo' for this.  Using just
'-X read_format:', or with a bad name, will make it print out
the full list (in tshark); just like the '-F' does for output
file formats.

Note: I am *not* putting in code for Win32 GUI,
because I can't compile that and I wouldn't have even
done the GTK one if I could compile Qt originally. (I don't think we need
to add any more features to GTK or Win32, just Qt from now on,
right?)

Change-Id: I2fe6481d186f63bd2303b9e591edf397a2e14b64
Reviewed-on: https://code.wireshark.org/review/493
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-05 18:38:05 +00:00
Alexis La Goutte abc6fb24fa Fix some code remove by 296591399f
(Copyright or info about file...)

Change-Id: I90ba8b1c3ec8406b0c3365a69a8555837fc4bbb1
Reviewed-on: https://code.wireshark.org/review/515
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-05 09:25:47 +00:00
Gerald Combs 083ea63f10 Add a cast.
Change-Id: Ib1885bcbe061942ecba55b90e6b1d9b20f033f41
Reviewed-on: https://code.wireshark.org/review/505
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-04 19:18:48 +00:00
Michal Labedzki 6a4049535a win32: Implement format type selector in open file dialog
Change-Id: Idef1829fcc2b7b08783e5288bb6486ce19c4779b
Reviewed-on: https://code.wireshark.org/review/405
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-04 18:31:48 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(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-04 14:27:33 +00:00
Bill Meier 1f2f2ba5fa Create/use an extended value-string; Move value-string array from .h file; 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-03 16:32:03 +00:00
Gerald Combs 0f2014bf21 Scan-build didn't like the fixes in g79ef36a5f.
Change-Id: I1083136f9e4fb38b55e9b9c2fec74ddec35f198e
Reviewed-on: https://code.wireshark.org/review/452
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-02 20:12:33 +00:00
Roland Knall 5f78d0f4f1 Fix ui/iface_lists.c - type attribute is not copied
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-02 09:53:40 +00:00
Gerald Combs 79ef36a5f0 Fix some scan-build warnings.
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-03-01 19:15:38 +00:00
Gerald Combs bac680caf5 Get Windows build working again.
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-25 22:49:18 +00:00
Bill Meier 11b5c15fdb Remove trailing whitespace
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-25 20:46:49 +00:00
Evan Huus 95e5a1d954 Use correct macro to really fix MacOSX buildbot
Change-Id: Ibb7b13c0c9c5699642cda48522b34ace34c28b46
Reviewed-on: https://code.wireshark.org/review/377
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 18:39:00 +00:00
Evan Huus 8ce395d92a Include old-gtk-compat.h to fix build.
Change-Id: I3614e11fb0e76625b2b9686be423bf421c295e6f
Reviewed-on: https://code.wireshark.org/review/376
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 18:12:02 +00:00
Michal Labedzki 579e7e19ce Wireshark: Add option to choose format type of capture file
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-25 17:43:13 +00:00
Alexis La Goutte 7bd14675b2 Fix Called C++ object pointer is null found by Clang
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-24 17:47:19 +00:00
Irene Rüngeler b26c445910 Limit the range to the TSNs provided.
Change-Id: Ibf72fb60d06baa7a9590a303f2e10e5a86c61093
Reviewed-on: https://code.wireshark.org/review/254
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-02-20 17:22:56 +00:00
Alexis La Goutte 1115889c0b Fix Branch condition evaluates to a garbage value found by Clang Analyzer
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-18 13:50:58 +00:00
Michal Labedzki ff0468f6d3 Add Logcat to Exported PDU
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-18 11:14:01 +00:00
Alexis La Goutte 4cea550c32 <Ctrl>R to restart does not work [Wireshark Qt]
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-17 21:46:58 +00:00
Alexis La Goutte 3aaa131000 On 'You have unsaved packets' dialog, expected D or <Alt>D to use as 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-17 21:46:06 +00:00
Alexis La Goutte 7447cd86e3 Menu cannot be reached using accelerators, for example <Alt-F> does not open 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-17 21:45:18 +00:00
Alexis La Goutte 1995e424df Stack overflow after selecting data when filter is applied that has no 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-16 14:07:37 +00:00
Evan Huus 4ca528f549 Add explicit casts to fix OSX10.5 Buildbot
Change-Id: I13fa3d6af3d0fddc367835fc05efdbe106b991e6
Reviewed-on: https://code.wireshark.org/review/228
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-16 14:06:13 +00:00
Evan Huus f7d2163b83 Replace last use of emem trees with GHashTables
Change-Id: I1cedc611c9b7888eb671cf858c6f7819d37afba9
Reviewed-on: https://code.wireshark.org/review/219
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-02-16 03:47:39 +00:00
Gerald Combs fd5e882fec About box: make sure we read AUTHORS-SHORT as UTF-8.
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-13 07:46:36 +00:00
Michal Labedzki 10084c344c RTP: Add support for SBC codec in RTP Player
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-12 01:36:02 +00:00
Gerald Combs 648769497a Fix a Qt version comparison.
Change-Id: I7df90d53a2d8f29042994bd0c2bc7bf4450fab10
Reviewed-on: https://code.wireshark.org/review/177
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11 19:46:10 +00:00
David Ameiss d49485e191 Statistics->Flow Graph in qtshark crashes with a segfault
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-11 18:11:04 +00:00
Gerald Combs 2a5618b5d1 Qt 5.2.1 for Mac has QtMacExtras but not QMacNativeToolBar.
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-10 20:07:57 +00:00
Gerald Combs f966980937 Replace "svn" with "git" all over the place.
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-07 23:03:03 +00:00
Gilbert Ramirez 4cc694839d Fix all -fstrict-alias warnings found by gcc 4.1.2
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-02-03 09:26:10 +00:00
Alexis La Goutte 5982c6179b Merge "Apply layouts in Qt Creator. Fix a tooltip." 2014-01-29 17:44:54 +00:00
Alexis La Goutte bdcf5496b3 lupdate / lrelease ui/qt/Qtshark.pro
svn path=/trunk/; revision=54968
2014-01-26 18:24:56 +00:00
Alexis La Goutte c6022b3b85 Drop support of Visual Studio 2005
* 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-26 12:56:32 +00:00
Alexis La Goutte 47f50d13ce Fix indent (Use 4 spaces) and add modelines
svn path=/trunk/; revision=54964
2014-01-26 12:56:16 +00:00
Bill Meier 9c953985a1 Clean up whitespace: use consistent indentation, etc;
Add editor modelines.

svn path=/trunk/; revision=54883
2014-01-22 01:10:31 +00:00
Alexis La Goutte c80e021e6f Add modelines info
svn path=/trunk/; revision=54855
2014-01-20 09:42:52 +00:00
Alexis La Goutte fdee928692 Fix indent (use 4 spaces) and remove trailing whitespace
svn path=/trunk/; revision=54854
2014-01-20 09:42:45 +00:00
Alexis La Goutte 663ddb38d2 Fix build with CMake (Missing tap_export_pdu in ui/CMakeLists.txt
svn path=/trunk/; revision=54853
2014-01-20 07:53:42 +00:00
Alexis La Goutte 18d3a7010f Fix typo (only need one comma)
svn path=/trunk/; revision=54852
2014-01-20 07:53:00 +00:00
Anders Broman e45896cafc Split the GUI and the tap part to make it possible to adapt to Qt.
svn path=/trunk/; revision=54850
2014-01-20 05:51:10 +00:00
Anders Broman 90ea235292 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54834
2014-01-17 19:35:57 +00:00
Anders Broman 43595fa3f0 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54833
2014-01-17 19:21:41 +00:00
Gerald Combs 7649011c91 Apply layouts in Qt Creator. Fix a tooltip.
Change-Id: I02759cb83ef970395a80acaafb9a28c630000000
2014-01-17 09:33:45 -08:00
Anders Broman 8c608ca3d1 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54826
2014-01-16 07:30:22 +00:00
Guy Harris 9374ede4ff Don't cast away constness.
svn path=/trunk/; revision=54818
2014-01-15 08:38:14 +00:00
Alexis La Goutte 62aef67720 Fix typo (Direcly => Directly)
svn path=/trunk/; revision=54804
2014-01-14 20:48:30 +00:00
Guy Harris 2e5c54935b In a source file that defines external functions, the header file that
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-14 01:35:13 +00:00
Guy Harris 6a37db92d1 Make a routine not used outside this file static.
svn path=/trunk/; revision=54746
2014-01-14 01:31:49 +00:00
Guy Harris 205162061e In a source file that defines external functions, the header file that
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-14 01:29:16 +00:00