osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
51946 commits 26 branches 0 tags 795 MiB
Commit graph

2431 commits

Author SHA1 Message Date
Guy Harris
91ad2eadb8 Include ui/progress_dlg.h to get the declaration of 
delayed_create_progress_dlg().

svn path=/trunk/; revision=54744
 2014-01-14 01:26:51 +00:00
Guy Harris
d041ec61af #if 0 out an unused routine. 
svn path=/trunk/; revision=54743
 2014-01-14 01:23:49 +00:00
Guy Harris
5a43b704c8 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=54742
 2014-01-14 01:16:55 +00:00
Guy Harris
8642c3f473 Make a routine used only in this file static. 
svn path=/trunk/; revision=54741
 2014-01-14 01:11:42 +00:00
Alexis La Goutte
e2cec3b990 Remove (ugly) hack in about_dialog.cpp (include main.cpp to have function to set comp_info_str and runtime_info_str variable) 
Now About Dialog is start after main() and variables is set by main(), only extern variable in wireshark_applicatin.h

svn path=/trunk/; revision=54696
 2014-01-11 12:16:56 +00:00
Alexis La Goutte
bf95d60829 Fix indent (use 4 spaces) and add modelines 
svn path=/trunk/; revision=54695
 2014-01-11 11:16:49 +00:00
Martin Mathieson
4debda5779 Note in a comment that with Gtk 3.4.4 reselecting UE+channel doesn't work as other UEs seem to get selected while list is being repopulated during retapping 
svn path=/trunk/; revision=54690
 2014-01-10 12:36:17 +00:00
Alexis La Goutte
7cbbf32324 Don't create About window when Wireshark Qt start 
svn path=/trunk/; revision=54662
 2014-01-08 14:43:41 +00:00
Martin Kaiser
9979ebf12d Coverity 280335, 280336 
check the return value of gtk_tree_selection_get_selected()

svn path=/trunk/; revision=54657
 2014-01-08 12:38:27 +00:00
Martin Kaiser
0b4aeb3b63 Coverity 280334 
check the return value of gtk_tree_selection_get_selected()
    
if there was no selected item, wireshark would crash
but this is very unlikely in practice

svn path=/trunk/; revision=54656
 2014-01-08 11:06:31 +00:00
Jakub Zawadzki
2abbb53d67 Remove svn:executable attribute. 
svn path=/trunk/; revision=54637
 2014-01-07 22:55:03 +00:00
Jörg Mayer
1df5d94c67 include config.h at the top of the file. 
A used parameter was marked unused.

svn path=/trunk/; revision=54629
 2014-01-07 21:09:03 +00:00
Alexis La Goutte
bcacd60c1c Fix indent (use 4 spaces) 
svn path=/trunk/; revision=54612
 2014-01-05 18:40:07 +00:00
Alexis La Goutte
f27990cfbb Fix indent (use 4 spaces) 
svn path=/trunk/; revision=54609
 2014-01-05 18:39:43 +00:00
Alexis La Goutte
88dcc80aad Enhance NSIS Windows installer (Wireshark Qt support) 
* Add Radiobox to choose File Association (Wireshark GTK or Qt)
* Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...)
* Fix unistaller (don't remove all icons...)
* ...

svn path=/trunk/; revision=54605
 2014-01-05 18:16:14 +00:00
Gerald Combs
d0f7a4fadf Add tooltips for the total number of streams. 
svn path=/trunk/; revision=54585
 2014-01-04 01:13:01 +00:00
Alexis La Goutte
ff19d5726d Update NEWS and Release note 
Revert part of last commit about AUTHORS-SHORT in Windows....

svn path=/trunk/; revision=54577
 2014-01-03 10:21:56 +00:00
Alexis La Goutte
5acabc99b0 It is AUTHORS-SHORT.txt in Windows 
Kept comment about dev release (and change logo)
Use the some order like Wireshark GTK (Authors before Folders)

svn path=/trunk/; revision=54569
 2014-01-02 20:21:09 +00:00
Jeff Morriss
a56494a526 Fix wireshark-qt startup coredump under autofoo and Windows: make cmake's 
VERSION_* macros integers instead of numbers (and treat them as such in
ui/qt/about_dialog.cpp).

svn path=/trunk/; revision=54563
 2014-01-02 19:11:06 +00:00
Alexis La Goutte
f5c6f39201 Add About window for Wireshark Qt 
svn path=/trunk/; revision=54557
 2014-01-02 17:04:10 +00:00
Alexis La Goutte
5490a6636d Fix icon in top of Wireshark Qt main window 
svn path=/trunk/; revision=54556
 2014-01-02 16:52:56 +00:00
Alexis La Goutte
2db085d864 Fix indent always use tab 
svn path=/trunk/; revision=54553
 2014-01-02 11:46:58 +00:00
Michael Mann
58346b6327 Move tcap and camel "persistent data" functionality to the dissectors themselves instead of being part of epan directory. 
svn path=/trunk/; revision=54499
 2013-12-30 22:07:38 +00:00
Bill Meier
8724d5de0f Use G_GUINT64_CONSTANT(nn) instead of nnULL in a few places. 
svn path=/trunk/; revision=54494
 2013-12-30 02:24:11 +00:00
Jakub Zawadzki
ce68b8db87 Make arrow down/ up work in gtk again. 
Broken by r54328 g_ascii_isprint() can test only char type and event->keyval is unsigned int.

svn path=/trunk/; revision=54492
 2013-12-29 23:29:03 +00:00
Martin Kaiser
fba61a31be add ssl detection to proto_get_frame_protocols() 
svn path=/trunk/; revision=54439
 2013-12-24 13:44:00 +00:00
Bill Meier
8ab9c55618 From Ville Skyttä: Spelling Fixes 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591


svn path=/trunk/; revision=54387
 2013-12-23 15:53:13 +00:00
Michael Mann
7ec4582b4f Add FT_SYSTEM_ID type and convert the dissectors that use print_system_id with FT_BYTES to now use FT_SYSTEM_ID type. 
svn path=/trunk/; revision=54383
 2013-12-23 15:18:48 +00:00
Jakub Zawadzki
0f8572cb51 Avoid including definition of column_info structure in dissectors. 
Move COL_* enum to <epan/column-utils.h>

XXX Later we can rename epan/column-info.h to column-int.h (or smth like this)

svn path=/trunk/; revision=54352
 2013-12-22 10:41:27 +00:00
Jakub Zawadzki
2e20f895be Argh, fix include. 
I start thinking about compiling (read: installing) Qt...

svn path=/trunk/; revision=54339
 2013-12-21 18:40:20 +00:00
Jakub Zawadzki
c40e1dc2d8 fix warnings. 
svn path=/trunk/; revision=54338
 2013-12-21 18:19:07 +00:00
Jakub Zawadzki
58289a8ba0 missing include 
svn path=/trunk/; revision=54336
 2013-12-21 18:00:00 +00:00
Jakub Zawadzki
4cf7cdd387 fix some warnings. 
svn path=/trunk/; revision=54334
 2013-12-21 17:34:41 +00:00
Jakub Zawadzki
deb2b236f2 Add missing includes 
svn path=/trunk/; revision=54332
 2013-12-21 17:23:17 +00:00
Jakub Zawadzki
aa4b08e2ca ui/gtk/follow_stream.c was using isprint.h hack, change all isprint() 
svn path=/trunk/; revision=54329
 2013-12-21 15:25:06 +00:00
Jakub Zawadzki
33ef0c2600 isascii(x) && isprint(x) -> g_ascii_isprint(x) 
svn path=/trunk/; revision=54328
 2013-12-21 15:12:11 +00:00
Jakub Zawadzki
746ee39329 Drop isprint.h use g_ascii_isprint() when this include hack was enabled. 
svn path=/trunk/; revision=54327
 2013-12-21 15:01:45 +00:00
Jakub Zawadzki
064082e68a Change G_GINT64_CONSTANT(xxxxU) to G_GUINT64_CONSTANT(xxxx) 
svn path=/trunk/; revision=54314
 2013-12-20 22:39:32 +00:00
Bill Meier
ccdb11e177 nnn'ULL' ==> G_GUINT64_CONSTANT(nnn) 
svn path=/trunk/; revision=54304
 2013-12-20 15:34:05 +00:00
Evan Huus
c38424311f Replace one more g_memmove with memmove, add a cast to make the Lua stuff 
compile.

svn path=/trunk/; revision=54296
 2013-12-20 14:45:24 +00:00
Evan Huus
2ae8edccea Rename more to_str functions to have ep_ in the name if they return ephemeral 
buffers. Remove two unused functions.

svn path=/trunk/; revision=54250
 2013-12-19 16:28:39 +00:00
Evan Huus
a6415ece0a Rename a couple of to_str functions to have ep_ in the name. This makes it 
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).

svn path=/trunk/; revision=54249
 2013-12-19 15:49:09 +00:00
Alexis La Goutte
fe7e1783f7 Remove unneeded #include epan/dissectors/packet-scsi.h 
svn path=/trunk/; revision=54234
 2013-12-18 21:21:08 +00:00
Irene Rüngeler
4729c083ac Add 'Filter Association' to context menu in packet list. 
svn path=/trunk/; revision=54219
 2013-12-18 13:49:10 +00:00
Irene Rüngeler
d65cb2e9ab Ignore the first line of the chunk statistics file. 
svn path=/trunk/; revision=54210
 2013-12-18 08:04:01 +00:00
Jeff Morriss
7dfbe304a7 Translate a little leftover German to English. 
svn path=/trunk/; revision=54208
 2013-12-18 02:25:53 +00:00
Alexis La Goutte
e9946f0130 Make Ubuntu Buildbot happy 
Fix following error:
../../../ui/qt/sctp_chunk_statistics_dialog.cpp: In member function ‘void SCTPChunkStatisticsDialog::fillTable(bool)’:
../../../ui/qt/sctp_chunk_statistics_dialog.cpp:145:29: error: ignoring return value of ‘char* fgets(char*, int, FILE*)’, declared with attribute warn_unused_result [-Werror=unused-result]

svn path=/trunk/; revision=54188
 2013-12-17 18:43:34 +00:00
Evan Huus
30447ecd8f Fix preprocessor macro and indentation. 
svn path=/trunk/; revision=54178
 2013-12-17 13:21:26 +00:00
Alexis La Goutte
3d6c71e906 Fix indent (use 4 spaces) and add modelines 
svn path=/trunk/; revision=54176
 2013-12-17 13:06:11 +00:00
Alexis La Goutte
7e2353f5d4 Make translatable ready SCTP Graph for Qt 
svn path=/trunk/; revision=54170
 2013-12-17 10:22:00 +00:00
Irene Rüngeler
7eb50571f4 Find the right frame when plottable was clicked. 
svn path=/trunk/; revision=54167
 2013-12-17 09:51:34 +00:00
Irene Rüngeler
25a74d3f2a Fill the chunk statistics. Read line with fgets instead of getline. 
svn path=/trunk/; revision=54166
 2013-12-17 08:56:47 +00:00
Irene Rüngeler
555b8a581a Add the header files only once. 
svn path=/trunk/; revision=54165
 2013-12-17 08:54:54 +00:00
Bill Meier
d2e947f442 Fix alignment issue in GTK2 flowgraph "packet choice" window. 
(Issue reported by Alexis Lagoutte).

##Backport 1.10

svn path=/trunk/; revision=54148
 2013-12-16 18:44:04 +00:00
Alexis La Goutte
c00a12652f Fix warning found by doxygen 
svn path=/trunk/; revision=54130
 2013-12-15 19:07:26 +00:00
Jakub Zawadzki
2c015bb386 Fix some const/ not const warnings. 
svn path=/trunk/; revision=54114
 2013-12-15 12:35:00 +00:00
Bill Meier
3ddb2011f9 Create/use several extended value-strings; 
(Sort & remove dups from underlying value_string arrays);
Reformat a few long lines;
Add editor modelines;


svn path=/trunk/; revision=54103
 2013-12-14 18:33:55 +00:00
Jakub Zawadzki
e0e86bab5a Fix const warnings. 
svn path=/trunk/; revision=54092
 2013-12-14 14:33:46 +00:00
Jakub Zawadzki
1053e722ed Fix warnings 
svn path=/trunk/; revision=54089
 2013-12-14 12:45:57 +00:00
Jakub Zawadzki
4d92f6079b Remove not needed ';' 
svn path=/trunk/; revision=54088
 2013-12-14 11:12:20 +00:00
Jakub Zawadzki
5c79cbf152 Fix some trivial warnings. 
svn path=/trunk/; revision=54085
 2013-12-14 10:29:26 +00:00
Gerald Combs
2f11c8f1ff Add a bunch of tooltips. 
svn path=/trunk/; revision=54081
 2013-12-14 00:07:27 +00:00
Gerald Combs
fde7a4c263 Simplify column sizing. 
svn path=/trunk/; revision=54068
 2013-12-13 21:31:01 +00:00
Gerald Combs
a2835dd48a Capture Interfaces dialog cleanup. 
Apply layouts as needed to allow resizing. Select the interface list by
row. We might want to switch the interface list to a QTreeWidget. Today
I learned that you can make QGroupBox titles checkable. Do that where we
enable and disable groups of items. Flatten all of the group boxes.
Change the output format combo to radio buttons. There are only two
choices and we have lots of real estate available. Use a
QDialogButtonBox so Qt can size and order the buttons appropriately.

svn path=/trunk/; revision=54052
 2013-12-13 18:36:59 +00:00
Chris Maynard
093ace5c24 Fix Visual Studio Code Analysis warning C6011: Dereferencing NULL pointer 'returnedDevmode' 
svn path=/trunk/; revision=54051
 2013-12-13 18:25:06 +00:00
Chris Maynard
4cabb63481 Fix Visual Studio Code Analysis warning C6001: Using uninitialized memory 'keylist' 
svn path=/trunk/; revision=54050
 2013-12-13 18:13:58 +00:00
Alexis La Goutte
14b210c6f0 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang 
svn path=/trunk/; revision=54044
 2013-12-13 14:16:46 +00:00
Michael Tüxen
ec9642f9c9 May this silences a warning of code that will go out next week. 
svn path=/trunk/; revision=54042
 2013-12-13 13:31:34 +00:00
Michael Tüxen
9a5d23c83c Try to silence warnings and add a comment for Irene to 
fix these appropriately next week.

svn path=/trunk/; revision=54041
 2013-12-13 13:00:29 +00:00
Michael Tüxen
0c5eccc277 Try to silence a warning due to a temporary workaround. 
svn path=/trunk/; revision=54040
 2013-12-13 11:34:37 +00:00
Alexis La Goutte
4f32d662fa Add Copyright and modelines (Fix also indent to use 4 spaces) 
svn path=/trunk/; revision=54038
 2013-12-13 11:29:11 +00:00
Irene Rüngeler
894bc27bd7 Fix typo 
svn path=/trunk/; revision=54037
 2013-12-13 11:20:21 +00:00
Irene Rüngeler
a2a48090da Fix typo. 
svn path=/trunk/; revision=54036
 2013-12-13 11:03:13 +00:00
Irene Rüngeler
92ed24dcf7 Fix gboolean bool conflict. 
svn path=/trunk/; revision=54035
 2013-12-13 10:56:31 +00:00
Alexis La Goutte
3ad28a943f Fix build when use Qt4 
ui/qt/sctp_chunk_statistics_dialog.cpp:16:40: error: ‘class QHeaderView’ has no member named ‘setSectionsClickable’
ui/qt/sctp_chunk_statistics_dialog.cpp:17:40: error: ‘class QHeaderView’ has no member named ‘setSectionsMovable’

svn path=/trunk/; revision=54034
 2013-12-13 10:56:14 +00:00
Irene Rüngeler
a1da50b91e Add sctp files to Makefile.am 
svn path=/trunk/; revision=54033
 2013-12-13 10:39:13 +00:00
Irene Rüngeler
dafe3d02ce Address more Windows errors. 
svn path=/trunk/; revision=54032
 2013-12-13 09:52:41 +00:00
Irene Rüngeler
7cfa3d05a3 Address Windows warning 
svn path=/trunk/; revision=54031
 2013-12-13 09:14:20 +00:00
Jörg Mayer
9792fe5d79 "Fix" 
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sctp_graph_byte_dialog.cpp:36:13: error: variable ‘minBytes’ set but not used [-Werror=unused-but-set-variable]
     guint32 minBytes, maxBytes;
             ^
cc1plus: all warnings being treated as errors


svn path=/trunk/; revision=54030
 2013-12-13 09:10:35 +00:00
Jörg Mayer
ecbca40104 "Fix" 'set but not used' warning turning error. 
svn path=/trunk/; revision=54029
 2013-12-13 09:09:06 +00:00
Irene Rüngeler
66d0882e85 Address Windows warning. 
svn path=/trunk/; revision=54028
 2013-12-13 08:41:26 +00:00
Irene Rüngeler
2c6d94bec3 Take sctp_stat.c off the list because it has been removed. 
svn path=/trunk/; revision=54027
 2013-12-13 08:01:24 +00:00
Irene Rüngeler
796bf409b0 Add dialogs and graphs to analyse SCTP behavior similar to the GTK version. 
svn path=/trunk/; revision=54026
 2013-12-13 07:25:30 +00:00
Bill Meier
1de89438f2 Create/use a number of extended value-strings; 
Remove or comment out dups from several value-string arrays;
 Sort a number of value-string arrays;
Reformat many hf[] entries;
Remove some unneeded initializers;
Add editor-modelines;
Use consistent indentation;
Reformat whitespace.

svn path=/trunk/; revision=53968
 2013-12-12 19:26:55 +00:00
Gerald Combs
018157cbb6 Fix the path to dumpcap. 
svn path=/trunk/; revision=53957
 2013-12-12 02:41:08 +00:00
Gerald Combs
12ef64b1aa Remove the checks for ../../lib. If it still exists it likely means that 
there's a stale LIBRARY_OUTPUT_PATH in CMakeCache.txt.

svn path=/trunk/; revision=53956
 2013-12-12 01:46:09 +00:00
Gerald Combs
8470f36423 Update library searches to reflect r53780. 
svn path=/trunk/; revision=53955
 2013-12-12 01:36:44 +00:00
Gerald Combs
3889cfc91b From Deon van der Westhuysen via bug 9537: 
----
The qt version of wireshark (stats_tree_dialog.cpp) by default expands
all nodes within a stats_tree (see for example the "Statistics" > "IP
Statistics" > "IP Destinations" stats_tree; you need this patch
installed before the item is added to the stats menu:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9528). This
behaviour is fine for small trees but becomes counter productive in
trees with many items or levels.

This patch changes the qt ui to act like the gtk ui: the first level of
nodes are expanded by default while deeper levels are collapsed.
----

From me: "Expand all" makes sense for a small number of items. Do so if
we have less than 100.

svn path=/trunk/; revision=53928
 2013-12-10 22:38:35 +00:00
Chris Maynard
67912bf798 Trivial: The file name is prefs_capture.c, not capture_prefs.c 
svn path=/trunk/; revision=53926
 2013-12-10 22:06:22 +00:00
Gerald Combs
c8c5ea1647 QComboBox::setCurrentText() exits in Qt3 and Qt5 but not Qt4. 
svn path=/trunk/; revision=53920
 2013-12-10 21:44:12 +00:00
Gerald Combs
7b4b912fb7 Fix prototypes. 
svn path=/trunk/; revision=53917
 2013-12-10 21:27:09 +00:00
Gerald Combs
1c9b5dfad3 Add "Decode As" to the packet list and protocol tree context menus. 
Automatically add a new item if "Decode As" is triggered from the
context menus.

svn path=/trunk/; revision=53915
 2013-12-10 21:07:26 +00:00
Gerald Combs
61461ccc6c Fix compilation on Windows. 
svn path=/trunk/; revision=53912
 2013-12-10 20:00:02 +00:00
Gerald Combs
17a67c3b5c Get the "Decode As" dialog working, albeit with a few warts. It differs 
from the GTK flavor in two major ways:

- The "Decode As" and "User Specified Decodes" dialog have been unified.
- You can modify the decode as behavior at any time, not just when you
  have a packet selected.

Revert part of 53498 so that we can move items marked

/*** THE FOLLOWING SHOULD NOT BE USED BY ANY DISSECTORS!!! ***/

from epan/decode_as.h to ui/decode_as_utils.h. 

Move "save" code from decode_as_dlg.c to decode_as_utils.c as well.

In packet-dcerpc.c don't register a table named "ethertype". We might
want to add checks for duplicate table names.

To do:
- Add support for ranges?
- Either add support for DCERPC or make DCERPC use a regular dissector
  table.
- Fix string selectors (i.e. BER).


svn path=/trunk/; revision=53910
 2013-12-10 19:23:26 +00:00
Irene Rüngeler
85d84776b8 Use PT_TXTMOD_NONE for columns that should not be editable. 
svn path=/trunk/; revision=53906
 2013-12-10 15:33:07 +00:00
Irene Rüngeler
7eb15db51c Do not show uat preferences if not registered for the gui. 
svn path=/trunk/; revision=53904
 2013-12-10 15:29:43 +00:00
Stig Bjørlykke
0d31c840ae Removed debug output. 
svn path=/trunk/; revision=53903
 2013-12-10 14:43:15 +00:00
Jakub Zawadzki
3ae2e5ece2 Fix warnings 
svn path=/trunk/; revision=53885
 2013-12-09 20:15:47 +00:00
Jakub Zawadzki
f91eba752b Fix some warnings: cast discards `__attribute__((const))' qualifier from pointer target type 
svn path=/trunk/; revision=53875
 2013-12-08 23:16:06 +00:00
Alexis La Goutte
5ed31d2de1 From David Ameiss via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9509 
qtshark Flow Graph displays wrong information in comments column

In qtshark, the flow graph is displaying the the frame label in the comments field. A simple fix, the patch is attached.

svn path=/trunk/; revision=53849
 2013-12-08 11:10:04 +00:00