osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
43,233 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

244 Commits

Author SHA1 Message Date
Alexis La Goutte f7e6d1a4a2 Disable Auto-generate *.qm file (Need some work...) 
svn path=/trunk/; revision=45759
 2012-10-24 15:51:28 +00:00
Gerald Combs caf8ed8e0c Try reverting r45351 again. It looks like the recent changes are 
confusing SVN:
http://www.wireshark.org/lists/wireshark-dev/201210/msg00190.html

svn path=/trunk/; revision=45714
 2012-10-22 15:50:43 +00:00
Guy Harris 30c709777e Include ui/win32/console_win32.c. 
svn path=/trunk/; revision=45695
 2012-10-21 19:49:40 +00:00
Pascal Quantin b439ae0d6a Revert r45692 and try to fix link failure another way: console_win32.[ch] definitely belong to ui/win32 
Add console_win32.[ch] to Makefile.am

svn path=/trunk/; revision=45693
 2012-10-21 19:12:18 +00:00
Alexis La Goutte 5af3defc46 Try to fix LINK : fatal error LNK1181: cannot open input file 'win32/console_win32.obj' 
move ui/win32/console_win32.[ch] to ui/console_win32.[ch]

svn path=/trunk/; revision=45692
 2012-10-21 18:10:31 +00:00
Alexis La Goutte b88ff840a3 Add MSWindows console to QtShark 
svn path=/trunk/; revision=45678
 2012-10-21 14:45:40 +00:00
Jakub Zawadzki b53dbea042 Make data_source opqaue, add getter for tvb. 
svn path=/trunk/; revision=45672
 2012-10-20 19:54:56 +00:00
Evan Huus 99ddfe913c Remove unused variable. 
svn path=/trunk/; revision=45664
 2012-10-19 22:04:44 +00:00
Gerald Combs d16be272c9 Fix columns. 
svn path=/trunk/; revision=45662
 2012-10-19 20:56:22 +00:00
Gerald Combs b369a09cd2 The file set and export object trees are lists. Make them act like 
it. Show human-readable sizes in the file set dialog. Move the
format_size_flags_e operator to qt_ui_utils.cpp for lack of a better
place.

svn path=/trunk/; revision=45661
 2012-10-19 19:04:21 +00:00
Evan Huus 97f5e101d9 Fix CMake build: 
- add some new files to CMakeLists
- we do need _U_ for C++ now that we're sharing some headers between
  C and C++.

svn path=/trunk/; revision=45650
 2012-10-18 22:20:36 +00:00
Gerald Combs 97fa2f2a5f Show the object export dialog in accordance with the Qt 
documentation. Remove our tap listener and clean up after ourselves.

svn path=/trunk/; revision=45648
 2012-10-18 21:51:38 +00:00
Gerald Combs 576b24c96e Move ui-independent object export routines to the common ui directory. 
Implement DICOM, HTTP, and SMB object exports. Rename the GTK+ export
files. C++-ize epan/tap.h. Fix an apparent memory leak in
eo_save_all_clicked_cb.

The Qt dialog has an indeterminate progress bar. I tried adding
something similar to the GTK+ dialog but event processing led down a
rabbit hole.

svn path=/trunk/; revision=45647
 2012-10-18 21:14:43 +00:00
Jakub Zawadzki 73b3d42302 Use local variable, local one is also used later by epan_dissect_run(). 
svn path=/trunk/; revision=45605
 2012-10-16 22:44:28 +00:00
Evan Huus 80d377d4f2 Don't try to use a non-existant pseudo_header variable. 
svn path=/trunk/; revision=45604
 2012-10-16 22:39:30 +00:00
Jakub Zawadzki 78631020b8 Add wtap_pseudo_header union to wtap_pkthdr structure. 
Use pkthdr instead of pseudo_header as argument for dissecting.

svn path=/trunk/; revision=45601
 2012-10-16 21:50:57 +00:00
Gerald Combs 74df9f0458 Add an include. 
svn path=/trunk/; revision=45596
 2012-10-16 20:38:22 +00:00
Gerald Combs 9f1fd13e9a Use topic_action instead of topic_cb for the Windows file dialogs. Move 
the common Qt help code to wireshark_application.cpp.

svn path=/trunk/; revision=45594
 2012-10-16 19:47:43 +00:00
Gerald Combs 8fa7cdad65 Remove some no-longer-needed SSL dummy routines. 
svn path=/trunk/; revision=45590
 2012-10-16 18:49:43 +00:00
Gerald Combs 403e6dc86a Move common SSL key export routines to ui/ssl_key_export.[ch]. Make the 
exported keys a gchar *. Implement SSL key exports in the Qt UI. Remove
some no-longer-necessary packet-ssl*.h includes.

Change lastOpenDir().absolutePath() to .canonicalPath(). Get rid of the
"Export As PostScript" action.

svn path=/trunk/; revision=45589
 2012-10-16 18:14:16 +00:00
Alexis La Goutte a7763680ac Fix In file included from export_dissection_dialog.cpp:24:0: export_dissection_dialog.h:66:34: error: field 'export_type_map_' has incomplete type export_dissection_dialog.cpp: In constructor 'ExportDissectionDialog::ExportDissectionDialog(QWidget*, capture_file*, export_type_e)': export_dissection_dialog.cpp:80:5: error: 'export_type_map_' was not declared in this scope export_dissection_dialog.cpp: In member function 'void ExportDissectionDialog::exportTypeChanged(QString)': export_dissection_dialog.cpp:214:20: error: 'export_type_map_' was not declared in this scope 
Missing <QMap> include in export_disssection_dialog.h (in my Ubuntu Box with Qt 4.7.4 ?)

svn path=/trunk/; revision=45574
 2012-10-16 07:46:58 +00:00
Evan Huus 8a10d8ddb5 Include config.h so that the necessary HAVE_HEADER_H macros are defined on the 
appropriate platforms.

svn path=/trunk/; revision=45571
 2012-10-16 00:42:30 +00:00
Evan Huus 08535a5831 Comment out some more unused code to fix a few gcc errors. 
svn path=/trunk/; revision=45570
 2012-10-16 00:38:23 +00:00
Gerald Combs d9df1abdc9 Use $${INSTALL_DIR} instead of wireshark-gtk2. 
svn path=/trunk/; revision=45569
 2012-10-16 00:11:42 +00:00
Gerald Combs 307c002793 Fix includes. 
svn path=/trunk/; revision=45568
 2012-10-16 00:08:59 +00:00
Gerald Combs 677c913f42 Add "Export Packet Bytes". 
svn path=/trunk/; revision=45567
 2012-10-16 00:01:23 +00:00
Gerald Combs 9051385deb Add help buttons. Ifdef out some code on Windows. 
svn path=/trunk/; revision=45564
 2012-10-15 18:32:51 +00:00
Anders Broman a3f65d3680 Try a experimental gtk3 build 
svn path=/trunk/; revision=45551
 2012-10-15 06:12:51 +00:00
Evan Huus 93f4ea8838 Always initiailize member variables in constructors, even if it's just to NULL. 
Use C++'s initializer syntax more.

svn path=/trunk/; revision=45519
 2012-10-13 01:37:48 +00:00
Evan Huus d11b00d760 Reduce variable scopes where possible. 
svn path=/trunk/; revision=45518
 2012-10-13 01:29:29 +00:00
Evan Huus 1ed9eb2ece Fix compilation with GCC: 
- initialization order
- unused and uninitialized local print_args_t
- missing comment on #endif

svn path=/trunk/; revision=45517
 2012-10-13 01:15:35 +00:00
Gerald Combs 86797e9c0a Fix initialization order. 
svn path=/trunk/; revision=45515
 2012-10-13 00:21:25 +00:00
Gerald Combs 419f851e34 Fix Windows compilation problems from r45513. #ifdef out some non-Windows 
code.  Get rid of a few uses of the global cfile.

svn path=/trunk/; revision=45514
 2012-10-13 00:18:46 +00:00
Gerald Combs cfa22deaae Add a packet format group box, similar to the packet range group box. 
Use it in the new "Export Packet Dissections" dialog.

I'm omitting PostScript exports on purpose. If you *really* need that
feature you can probably get better results than we produce using text +
enscript or print-to-PDF + pdf2ps/pdftops or PSML/PDML + XSL + ...

The Windows code is untested. I'll check in any needed fixes shortly.

svn path=/trunk/; revision=45513
 2012-10-12 23:40:29 +00:00
Alexis La Goutte 9392d98978 Make new text translatable (a 
And lupdate QtShark.pro (update translation file)
Updating 'qtshark_de.ts'...
    Found 257 source text(s) (15 new and 242 already existing)
    Kept 1 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 257 source text(s) (15 new and 242 already existing)
    Kept 1 obsolete entries
    Same-text heuristic provided 1 translation(s)


svn path=/trunk/; revision=45492
 2012-10-11 21:45:05 +00:00
Alexis La Goutte 85b7bec830 Fix crash when use pcapng with comments (with QtShark) 
ERROR:proto_tree.cpp:125:void proto_tree_draw_node(proto_node*, gpointer): code should not be reached

(Missing color information for PI_COMMENT)

svn path=/trunk/; revision=45468
 2012-10-11 12:31:39 +00:00
Jörg Mayer 6f5bc4ea12 Revert 
------------------------------------------------------------------------
  r45351 | eapache | 2012-10-06 22:18:28 +0200 (Sa, 06 Okt 2012) | 3 lines

  Don't store qm files in svn: they're generated from the ts files and get removed
  on a make clean.

  ------------------------------------------------------------------------

it breaks out of tree builds and I don't have the time to fix that right now.


svn path=/trunk/; revision=45441
 2012-10-10 04:42:03 +00:00
Gerald Combs b28da10eec Fix Qt compilation on Windows. Check the user-supplied range syntax 
and provide instant feedback in the Win32 file dialog similar to the Qt
code. Tango-ize some colors. Escape a backslash in QtShark.pro.

svn path=/trunk/; revision=45430
 2012-10-09 15:34:40 +00:00
Evan Huus af9da8bf6e Add syntax_line_edit.h to CMakeLists to fix CMake qtshark build. 
svn path=/trunk/; revision=45414
 2012-10-09 00:54:40 +00:00
Gerald Combs 445148ac0e Add a PacketRangeGroupBox widget. Use it to implement "Export Selected 
Packets". Not yet tested on Windows. "Ignore Packet" hasn't been
implemented so we can't test that either.

Create a SyntaxLineEdit widget from the QLineEdit code in
DisplayFilterEdit. Use it in the file import and export dialogs and the
PacketRangeGroupBox widget. This lets us provide instant feedback
instead of popping up an error dialog.

Expand the Tango color list based on
http://emilis.info/other/extended_tango .

Rearrange QtShark.pro to (hopefully) work better with Qt Creator.

svn path=/trunk/; revision=45405
 2012-10-08 20:01:59 +00:00
Alexis La Goutte 576d1fb8db Update French translations ! 
svn path=/trunk/; revision=45384
 2012-10-08 12:25:23 +00:00
Alexis La Goutte 579eb18a6d Make new text translatable (for QtShark:file_set_dialog.cpp) 
and lupdate qtshark.pro (update translation file)
Updating 'qtshark_de.ts'...
    Found 243 source text(s) (45 new and 198 already existing)
Updating 'qtshark_fr.ts'...
    Found 243 source text(s) (45 new and 198 already existing)
    Number heuristic provided 1 translation(s)


svn path=/trunk/; revision=45383
 2012-10-08 12:16:54 +00:00
Gerald Combs d808f5c13a Get QMake to build our .qm files. 
svn path=/trunk/; revision=45356
 2012-10-06 21:36:24 +00:00
Evan Huus 5560416f3a Don't store qm files in svn: they're generated from the ts files and get removed 
on a make clean.

svn path=/trunk/; revision=45351
 2012-10-06 20:18:28 +00:00
Guy Harris 1ef26ea00f Fix tpyo. 
svn path=/trunk/; revision=45318
 2012-10-04 18:49:35 +00:00
Alexis La Goutte 2d8a0b5158 Update translation files 
Updating 'qtshark_de.ts'...
    Found 198 source text(s) (135 new and 63 already existing)
    Kept 9 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 198 source text(s) (135 new and 63 already existing)
    Kept 9 obsolete entries


svn path=/trunk/; revision=45314
 2012-10-04 18:26:37 +00:00
Alexis La Goutte 79d7ae18aa Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=45312
 2012-10-04 18:16:08 +00:00
Guy Harris 96bc499fd8 Include packet-range.h on Windows - file_dlg_win32.h uses 
packet_range_t, which is defined in packet-range.h.

svn path=/trunk/; revision=45300
 2012-10-03 20:48:27 +00:00
Gerald Combs 409b405d7c Move the main window slots to main_window_slots.cpp. 
svn path=/trunk/; revision=45259
 2012-10-02 18:47:05 +00:00
Gerald Combs e46cf2a726 Don't bother setting a background gradient in the toolbar on Windows. 
svn path=/trunk/; revision=45246
 2012-10-01 22:57:34 +00:00