Commit Graph

997 Commits

Author SHA1 Message Date
Jörg Mayer bf92ff4a3e Remove an empty line
svn path=/trunk/; revision=44334
2012-08-08 12:33:13 +00:00
Michael Mann 3d12ea758b Base framework to allow all preferences to be part of generic preferences API. Implementation will follow, but I wanted the framework in place first.
svn path=/trunk/; revision=44331
2012-08-08 12:13:24 +00:00
Irene Rüngeler 5311957c0e Add refresh button, if interfaces are not found.
svn path=/trunk/; revision=44328
2012-08-08 07:53:57 +00:00
Jörg Mayer 3b8d3f5fe5 As of r44326 everything builds with GDK_DISABLE_DEPRECATED
svn path=/trunk/; revision=44327
2012-08-08 07:09:33 +00:00
Anders Broman f463e9de51 It handles GDK_DISABLE_DEPRECATED
svn path=/trunk/; revision=44326
2012-08-08 07:02:57 +00:00
Martin Mathieson aa65475748 Use a common function for doing zoom (shared by mouse and keyboard).
svn path=/trunk/; revision=44321
2012-08-08 02:51:22 +00:00
Martin Mathieson 9fd94df70f Do the cross like it is in rlc_lte_graph.c, i.e. by just drawing black
lines, then erasing by re-showing the current pixmap.

svn path=/trunk/; revision=44316
2012-08-07 23:04:48 +00:00
Martin Mathieson f8b3e7c317 Fix a test to avoid the cross leaving a line behind at the top of the
graph.

svn path=/trunk/; revision=44315
2012-08-07 23:03:07 +00:00
Jörg Mayer 9b72dc1fb2 Small status update
svn path=/trunk/; revision=44314
2012-08-07 22:10:51 +00:00
Martin Mathieson 5c1c9d2244 Don't add 0.5 to coordinates used for drawing the cross. Was going
beyond the area and leaving artifacts.

svn path=/trunk/; revision=44313
2012-08-07 21:42:53 +00:00
Martin Mathieson 41d9e15025 Redo the cross drawing/erasing.
Draw in black, erase by just redrawing the current pixmap.

Will apply to tcp_graph.c if/when this gets through the buildbots.

svn path=/trunk/; revision=44308
2012-08-07 19:11:43 +00:00
Alexis La Goutte b245c46c50 lupdate QtShark.pro
Updating 'qtshark_de.ts'...
    Found 72 source text(s) (16 new and 56 already existing)
    Kept 13 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 72 source text(s) (16 new and 56 already existing)
    Kept 10 obsolete entries
    Similar-text heuristic provided 3 translation(s)

Also remove $Id$, it is xml file (auto)generated by Qt (lupdate)

svn path=/trunk/; revision=44305
2012-08-07 16:08:23 +00:00
Alexis La Goutte 75077bf043 Fix Typo Tshark => TShark
svn path=/trunk/; revision=44304
2012-08-07 16:04:38 +00:00
Alexis La Goutte 43e031bf86 Apply the change of revision 44103 to QtShark
( It is link Tshark Help not Wireshark (already in bottom !))

Also remove $Id$, it is Xml file (auto)generated by Qt Design

svn path=/trunk/; revision=44303
2012-08-07 15:42:43 +00:00
Michael Tüxen f9d6206170 Make the Ubuntu buildbot happy.
svn path=/trunk/; revision=44302
2012-08-07 15:22:09 +00:00
Irene Rüngeler ff80e34de5 Fix bug when compiling several filters.
svn path=/trunk/; revision=44301
2012-08-07 14:38:27 +00:00
Anders Broman 52cb35b85a It should now compile with GDK_DISABLE_DEPRECATED
svn path=/trunk/; revision=44300
2012-08-07 13:58:23 +00:00
Jörg Mayer bb57fa3ec2 Fix
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/capture_dlg.c:209:19: error: ‘compile_bpf_w’ defined but not used [-Werror=unused-variable]


svn path=/trunk/; revision=44299
2012-08-07 13:51:10 +00:00
Irene Rüngeler 02648076ee Add window with notebooks to display bpf compile results.
svn path=/trunk/; revision=44298
2012-08-07 13:25:42 +00:00
Irene Rüngeler 0d40bf21fc Make Windows buildbot happy.
-This line, and those below, will be ignored--

M    ui/gtk/capture_dlg.c

svn path=/trunk/; revision=44294
2012-08-07 10:30:30 +00:00
Irene Rüngeler ed26851415 Make macos buildbot happy
svn path=/trunk/; revision=44293
2012-08-07 10:25:01 +00:00
Jörg Mayer 1899edcb46 Fix for
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/capture_dlg.c:4016:18: error: unused variable ‘all_compile_bt’ [-Werror=unused-variable]


svn path=/trunk/; revision=44291
2012-08-07 09:15:22 +00:00
Irene Rüngeler b092c105ed Add a filter for all selected interfaces to the capture options dialog.
svn path=/trunk/; revision=44290
2012-08-07 07:58:05 +00:00
Jörg Mayer 5bf74638a3 Set svn properties
svn path=/trunk/; revision=44286
2012-08-06 20:58:19 +00:00
Jörg Mayer 78be49a3d0 Add Id header (and the standard copyright headers) to some files.
svn path=/trunk/; revision=44285
2012-08-06 20:50:30 +00:00
Gerald Combs 704c2e0355 Apparently QPointFs draw on center. Offset them in order to avoid
gratuitous antialiasing.

svn path=/trunk/; revision=44284
2012-08-06 20:44:33 +00:00
Alexis La Goutte 16821fe43c Fix Unknown test function: packagesExist when launch qmake QtShark.pro
packagesExist is only present in Qt >= 4.8 ( https://bugreports.qt-project.org/browse/QTBUG-11418 )
Add packagesExist function if Qt < 4.8 ( from http://qt.gitorious.org/qt/qt/merge_requests/1022 )

svn path=/trunk/; revision=44282
2012-08-06 16:17:16 +00:00
Jörg Mayer 74a3a6e405 Don't call "Q_OBJECT" if there are no signals or slots defined.
Fix cmake (and possibly autotools) build for:

lib/libqtui.a(interface_tree.cpp.o): In function `SparkLineDelegate':
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sparkline_delegate.h:10: undefined reference to `vtable for SparkLineDelegate'

This would not show up using qtcreator due to the magic of qmake.

I must admit that I don't fully understand what I am doing here, but
I read the following thread to the bottom and one of the last posts
contained the solution:
http://stackoverflow.com/questions/1095298/gcc-c-linker-errors-undefined-reference-to-vtable-for-xxx-undefined-refere


svn path=/trunk/; revision=44280
2012-08-06 10:59:00 +00:00
Martin Mathieson 463917942d Add right mouse button grab/moving feature (from tcp_graph.c).
svn path=/trunk/; revision=44276
2012-08-05 14:20:23 +00:00
Martin Mathieson a0a35a9c49 Reset a flag when restore to original view, again to avoid leaving a
cross on the screen.

svn path=/trunk/; revision=44273
2012-08-05 01:04:41 +00:00
Martin Mathieson a67e77adea Add cross-hairs here too. Draw lines, but don't change mouse cursor.
svn path=/trunk/; revision=44272
2012-08-05 01:03:33 +00:00
Martin Mathieson eab4e35254 When the graph has been redrawn (after resize or move), set the
redraw_needed flag to FALSE to avoid leaving crosses behind.

svn path=/trunk/; revision=44271
2012-08-05 00:27:48 +00:00
Martin Mathieson d89adc3f3b GTK3 still failing. Fix a typo.
svn path=/trunk/; revision=44270
2012-08-04 22:38:03 +00:00
Martin Mathieson ebc7cf7d41 GTK 3 is broken. This time, pass in GtkWidget* to get_mouse_position().
svn path=/trunk/; revision=44269
2012-08-04 22:07:54 +00:00
Martin Mathieson e6c095048d Try to enable the line crosshairs again.
This time, use a wrapper function get_mouse_position() that will call
the correct APIs whether GTK 3 or not.

svn path=/trunk/; revision=44268
2012-08-04 20:53:56 +00:00
Martin Mathieson 00c8b9f2ab Oops, seems that the cross-hair code uses the deprecated
gdk_window_get_pointer().  Turn it off again for now...

svn path=/trunk/; revision=44263
2012-08-04 18:37:34 +00:00
Martin Mathieson 8e4bd34d98 Add the cross-hairs back, can switch off again if doesn't work on all
supported platforms / library versions.

svn path=/trunk/; revision=44262
2012-08-04 17:51:34 +00:00
Gerald Combs 6766420142 Take out a debugging statement.
svn path=/trunk/; revision=44260
2012-08-04 04:35:34 +00:00
Gerald Combs 215d89c890 Draw selected items properly.
svn path=/trunk/; revision=44259
2012-08-04 02:02:40 +00:00
Gerald Combs 1500f3bd42 Fix sparlines on Windows. Unfortunately this means listing device IDs
(for now at least).

svn path=/trunk/; revision=44258
2012-08-04 00:37:04 +00:00
Jörg Mayer ed6e29eac6 Try to copy over the changes to QtShark.pro to automake and cmake.
Note: It still fails with
Linking CXX executable qtshark
lib/libqtui.a(interface_tree.cpp.o): In function `SparkLineDelegate':
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sparkline_delegate.h:10: undefined reference to `vtable for SparkLineDelegate'
collect2: error: ld returned 1 exit status


svn path=/trunk/; revision=44257
2012-08-04 00:31:31 +00:00
Gerald Combs 51e75f3bb3 Qt Creator put sparkline_delegate.{cpp,h} in their own special sections.
Don't do that.

svn path=/trunk/; revision=44256
2012-08-04 00:21:21 +00:00
Gerald Combs 450965360c Another capture_globals.h fix.
svn path=/trunk/; revision=44255
2012-08-04 00:10:27 +00:00
Gerald Combs b82eedf94a Make sure global_capture_opts is properly declared.
svn path=/trunk/; revision=44254
2012-08-04 00:01:59 +00:00
Gerald Combs a234d1215c Move capture_globals.h from ui/gtk/ to ui/. Show interface activity
using sparklines in the qtshark main window.

svn path=/trunk/; revision=44253
2012-08-03 23:30:47 +00:00
Jeff Morriss 0114eca349 Remove another set-but-not-used variable.
svn path=/trunk/; revision=44252
2012-08-03 22:04:09 +00:00
Jeff Morriss 76150c9a20 Fix a typo.
svn path=/trunk/; revision=44251
2012-08-03 18:11:26 +00:00
Jeff Morriss 78c4677cfb (Attempt to) avoid using capture_page uninitialized when we don't HAVE_LIBPCAP.
svn path=/trunk/; revision=44250
2012-08-03 17:41:06 +00:00
Jeff Morriss 91b3e8e24a Remove set-but-unused variable.
svn path=/trunk/; revision=44249
2012-08-03 17:33:01 +00:00
Irene Rüngeler 2eda9f759f Make it compile under Windows
svn path=/trunk/; revision=44240
2012-08-03 11:42:15 +00:00
Irene Rüngeler 2e1952678f Make the columns of the capture options dialog selectable. Changes are stored in the preferences file.
The ordering can be changed by dragging the column. The order is not stored.

svn path=/trunk/; revision=44239
2012-08-03 11:15:40 +00:00
Gerald Combs 523ce7d8b5 Pick up PortAudio dynamically.
svn path=/trunk/; revision=44208
2012-08-02 14:29:33 +00:00
Anders Broman 9b2d2a2433 Make the #define USE_CROSSHAIR_CURSOR 0 codepath compile.
svn path=/trunk/; revision=44204
2012-08-02 11:37:06 +00:00
Martin Mathieson 3e09bb9bf1 Cast event->x and event->y to int to avoid warnings seen on Windows
buildbots. 

svn path=/trunk/; revision=44201
2012-08-02 03:53:18 +00:00
Martin Mathieson a5a1aebc43 The keyboard and mouse zoom functions were almost identical - use a
common routine instead.

svn path=/trunk/; revision=44200
2012-08-02 03:18:35 +00:00
Martin Mathieson 1c3bee8ba4 Don't bother sorting the x & y order of the points in a line before
drawing.

svn path=/trunk/; revision=44199
2012-08-02 01:18:45 +00:00
Gerald Combs 15862a8fae Fix a variable name.
svn path=/trunk/; revision=44198
2012-08-02 00:04:44 +00:00
Gerald Combs ff2977fdd6 It looks like we haven't inserted anything into the cap_settings_history
hash table since r40715. Remove it and its associated functions.

C++-ize iface_lists.h.

svn path=/trunk/; revision=44197
2012-08-01 23:35:18 +00:00
Gerald Combs bd855826a9 Move the common parts of iface_lists.[ch] from ui/gtk/ to ui/. Leave the
GTK+-specific parts behind in capture_dlg.c.

svn path=/trunk/; revision=44196
2012-08-01 22:32:14 +00:00
Gerald Combs 02894a0be8 Move utf8_entities.h to the "ui" directory. Separate packet information
items with MIDDLE DOTs.

svn path=/trunk/; revision=44194
2012-08-01 19:18:49 +00:00
Jörg Mayer 0e5b323ace spelling fix (hopefully)
svn path=/trunk/; revision=44191
2012-08-01 18:42:10 +00:00
Jörg Mayer ffb4be37a6 Make the changes of r44165 build with autofoo and cmake as well
svn path=/trunk/; revision=44190
2012-08-01 18:27:57 +00:00
Gerald Combs 005ac60289 More style tweaks.
svn path=/trunk/; revision=44189
2012-08-01 16:17:47 +00:00
Jeff Morriss dc3629ad55 #include old-gtk-compat.h in order to get compilation working with older gtks.
svn path=/trunk/; revision=44188
2012-08-01 14:33:12 +00:00
Anders Broman 1cd8b5b0cc Get rid of some GTK_CHECK_VERSION instances by using compabillity macros.
svn path=/trunk/; revision=44186
2012-08-01 13:41:40 +00:00
Gerald Combs 0c3fd84ef5 Adjust the text size on OS X. This introduces an artifact that affects
the expert indicator. Maybe we should use SVG icons instead of PNGs.

svn path=/trunk/; revision=44176
2012-08-01 00:06:21 +00:00
Jeff Morriss d1bb5b5860 (Attempt to) reflect the file moves from r44165.
svn path=/trunk/; revision=44174
2012-07-31 22:57:04 +00:00
Gerald Combs 6791192b97 Don't overwrite preview item labels.
svn path=/trunk/; revision=44173
2012-07-31 22:12:41 +00:00
Alexis La Goutte 0120281417 Add icon to QtShark.exe for Windows
Fix the patch to the icon..

svn path=/trunk/; revision=44171
2012-07-31 20:50:24 +00:00
Alexis La Goutte bc77426c97 Add icon to QtShark.exe for Windows
qstshark.rc => qtshark.rc 

svn path=/trunk/; revision=44170
2012-07-31 20:47:07 +00:00
Gerald Combs 3c17d11e7a Make sure splitter handles are visible on Windows.
svn path=/trunk/; revision=44169
2012-07-31 20:46:14 +00:00
Alexis La Goutte a7ce184f6c Add icon to QtShark.exe for Windows
svn path=/trunk/; revision=44167
2012-07-31 20:42:59 +00:00
Alexis La Goutte ca5f417aa0 Add icon to Help Menu (Help, Wiki, About)
(Not found a Home icon for Website in Qt framework...)

Add also F1 shortcut for contents and access key

svn path=/trunk/; revision=44166
2012-07-31 20:34:14 +00:00
Gerald Combs d44f940aaf Add an expert level indicator. Move a bunch of resources to image/.
svn path=/trunk/; revision=44165
2012-07-31 20:00:25 +00:00
Gerald Combs 57110f6e61 Fixup the progress bar spacing.
svn path=/trunk/; revision=44159
2012-07-31 16:57:33 +00:00
Chris Maynard 6d601e9aa5 Add another cast that should have been part of r44025 to fully resolve Coverity CID 703863: Unintentional integer overflow.
svn path=/trunk/; revision=44158
2012-07-31 14:51:06 +00:00
Anders Broman df0bef704a From Michael Mann:
Expand show version preference.
implementation of Steven's suggestion of a radio button (actually
dropdown) of the 4 possibilities. 

I changed  the default to  have the version on both in
the welcome screen and on the window as that's how it was and people tend not to change the preferences I think.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6437

svn path=/trunk/; revision=44153
2012-07-31 07:27:39 +00:00
Gerald Combs 231acd1399 Font size + hint updates for Windows.
svn path=/trunk/; revision=44148
2012-07-31 00:13:34 +00:00
Gerald Combs 0161f2aa88 Try to choose a better default font. Fix a runtime warning in the status
bar.

svn path=/trunk/; revision=44147
2012-07-31 00:00:35 +00:00
Gerald Combs fc1e1a9d4c Get rid of a couple of focus halos.
svn path=/trunk/; revision=44145
2012-07-30 21:46:38 +00:00
Martin Mathieson 4563416c93 Zoom in/out more slowly, and don't redefine zoom struct.
svn path=/trunk/; revision=44144
2012-07-30 21:40:30 +00:00
Gerald Combs 1475a7a704 Rename "Files" to "Recent Files". Add space between each recent item.
Elide text instead of scrolling horizontally. Add a hover indication.

svn path=/trunk/; revision=44143
2012-07-30 21:36:23 +00:00
Gerald Combs 3392211002 Grow the dialog to account for our added widgets.
svn path=/trunk/; revision=44142
2012-07-30 21:22:53 +00:00
Martin Mathieson 4417fa263a Put back the configure_event() handler - it is needed for handling
resizing.

svn path=/trunk/; revision=44139
2012-07-30 14:42:14 +00:00
Martin Mathieson c58f4f28c4 Try to unbreak the build.
Apologies, I changed the clock time on my computer and so the file
didn't get rebuilt with the last of my changes...

svn path=/trunk/; revision=44127
2012-07-30 01:54:49 +00:00
Martin Mathieson 1f7e43bdb0 Remove yet more unneeded remnants from tcp_graph.c
svn path=/trunk/; revision=44126
2012-07-30 01:19:27 +00:00
Martin Mathieson e0d8893362 Don't try to clip the line to the outside of the visible area - let
cairo do it.  The clipping that was done worked properly for horizontal/verical
lines only, but would not for diagonal ones.

svn path=/trunk/; revision=44125
2012-07-29 23:03:50 +00:00
Martin Mathieson 4944c79982 Just let cairo clip lines to the edge of the visible graph area.
tcp_graph.c needlessly does this itself, but it only has to deal with horizonal
and vertical lines....

When have returned to original, unzoomed state, set zoom to be 'in' for
the middle mouse button, as thats all that makes sense.

svn path=/trunk/; revision=44124
2012-07-29 22:53:13 +00:00
Alexis La Goutte e2cd738ca5 Add link to Ask Wireshark Website ( http://ask.wireshark.org )in Help Menu for GTK
May be add a icon before (use favicon of Ask Website ?)

Backport to older release ?

svn path=/trunk/; revision=44104
2012-07-29 15:02:12 +00:00
Alexis La Goutte a355040132 It is link Tshark Help not Wireshark (already in bottom !)
#BACKPORT

svn path=/trunk/; revision=44103
2012-07-29 14:51:43 +00:00
Martin Mathieson ca69ea72a8 Tidy up help window, and get rid of a compile-time option to preserve
the 'old' button settings (used by tcp_graph.c).

svn path=/trunk/; revision=44100
2012-07-29 02:57:37 +00:00
Martin Mathieson f83953e465 Set maximum zoom on Y axis based upon bounds, so works better if there
isn't an SN=1023 for the channel.

Now I understand the time origin toggle - make it show the capture time
by default now.

svn path=/trunk/; revision=44099
2012-07-29 02:09:37 +00:00
Evan Huus 98bbc5a3d9 Simply #ifdefs slightly in the graph code.
Makes cppcheck happier.

svn path=/trunk/; revision=44092
2012-07-28 15:16:41 +00:00
Martin Mathieson 51fdf55f23 Further speed up drawing of the element list by:
- only setting the colour when it has changed
- only calling cairo_stroke() when we need to rather than after every
  element

These improvements were previously made to rlc_lte_graph.c.  I did look
at trying to extract what these 2 graph modules  had in common, but gave up pretty quickly
when I saw how much they had diverged...

svn path=/trunk/; revision=44087
2012-07-28 02:46:46 +00:00
Martin Mathieson 0a63212cc1 More cleaning up of unused remnants from tcp_graph.c.
svn path=/trunk/; revision=44081
2012-07-27 21:45:21 +00:00
Gerald Combs 5fc656ee46 Add a preview to the common file dialog. Adjust the win32 file dialog
preview logic slightly.

svn path=/trunk/; revision=44080
2012-07-27 21:43:02 +00:00
Jakub Zawadzki c2764ba5f3 Fix reference counting of GdkPixbuf, unref after creating GtkImage (aka fix memleaks)
Valgrind log:
  = 47,616 bytes in 1 blocks are possibly lost in loss record 41,578 of 41,608
  =    at 0x4C26ABB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
  =    by 0xAA2BA53: gdk_pixbuf_new (in /usr/lib64/libgdk_pixbuf-2.0.so.0.2200.1)
  =    by 0x10379F2F: ??? (in /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so)
  =    by 0x1037A4FD: ??? (in /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so)
  =    by 0xAA3132E: gdk_pixbuf_new_from_xpm_data (in /usr/lib64/libgdk_pixbuf-2.0.so.0.2200.1)
  =    by 0x4589B5: xpm_to_widget (gui_utils.c:572)
  =    by 0x4E3FC4: about_wireshark (about_dlg.c:86)

svn path=/trunk/; revision=44066
2012-07-27 08:49:41 +00:00
Martin Mathieson 348f79931d Limit zoom vertically to around 90 pixels / sequence number.
svn path=/trunk/; revision=44057
2012-07-26 21:16:23 +00:00
Jakub Zawadzki 80721f5498 Fix memleak in window_icon_realize_cb()
gtk_window_set_icon_list() duplicates list so after setting we need
to free generated one.

svn path=/trunk/; revision=44052
2012-07-26 17:23:35 +00:00
Michael Tüxen 685f74c24d Try to make the buildbot without libpcap happy...
svn path=/trunk/; revision=44042
2012-07-26 13:27:18 +00:00
Anders Broman d20be7ed47 Don't mark used parameters as unused.
Use the function parameter not the global variable.

svn path=/trunk/; revision=44038
2012-07-26 12:23:24 +00:00
Anders Broman de022f5bed Separate the Capture menu actions from main_menu_bar_entries.
svn path=/trunk/; revision=44036
2012-07-26 09:43:28 +00:00
Jakub Zawadzki b90fabe60d Make columnized and colorized bit field.
svn path=/trunk/; revision=44034
2012-07-26 09:36:15 +00:00
Jakub Zawadzki d9b0f40749 Add checks if stamp values matches. Remove packet_list_visible_record
svn path=/trunk/; revision=44033
2012-07-26 09:20:05 +00:00
Jakub Zawadzki 937ea48213 physical_pos is now used only for checks, ifdef it in PACKET_PARANOID_CHECKS to save some memory
svn path=/trunk/; revision=44032
2012-07-26 09:19:52 +00:00
Jakub Zawadzki c5bc6afb0c Exploit short-circuit evaluation, so first check variable, later call function
svn path=/trunk/; revision=44031
2012-07-26 09:19:37 +00:00
Jakub Zawadzki 83821d08b3 Move checks outside loop
svn path=/trunk/; revision=44030
2012-07-26 09:19:22 +00:00
Jakub Zawadzki 5d14f7e7f2 Pass record to packet_list_change_record() not physical_pos
svn path=/trunk/; revision=44029
2012-07-26 09:19:03 +00:00
Chris Maynard e49240205d Fix Coverity CID's 703862-703863: Unintentional integer overflow.
svn path=/trunk/; revision=44025
2012-07-26 02:42:40 +00:00
Jakub Zawadzki b3ac15f492 Fix buildbot warning: variable `fdata' set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=44007
2012-07-25 19:25:23 +00:00
Jakub Zawadzki 6349999757 Allocate col_text & col_text_len only for columns not based on frame_data
svn path=/trunk/; revision=44006
2012-07-25 18:01:42 +00:00
Jakub Zawadzki 59de6c3a8f Remove packet_list->column_types
svn path=/trunk/; revision=44005
2012-07-25 18:00:38 +00:00
Jakub Zawadzki fce74c732b Make PacketListRecord structure private.
svn path=/trunk/; revision=44004
2012-07-25 17:59:56 +00:00
Martin Mathieson e1258c6e15 Remove handlers for a couple of events we're not interested in.
svn path=/trunk/; revision=44002
2012-07-25 17:18:36 +00:00
Martin Mathieson 4b4eb03153 Only call cairo_stroke() when the colour changes, and at the end of the
long list of elements.  Now the graph is like greased lightening!

I will look later to see if I can apply the same change to the TCP
graphs.

svn path=/trunk/; revision=44001
2012-07-25 15:34:31 +00:00
Anders Broman ae021363c8 Unify the AktionEntries for apply/prepare filter we should probably
do the same type thing for the ui_desciptions.

 eg put a "place holder" in the UI descriptions and
make a call from main_menubar.c i.e add_filter_menu()
and do the UI stuff there.

svn path=/trunk/; revision=43999
2012-07-25 15:15:16 +00:00
Martin Mathieson 8fcbfe6022 When drawing the line elements, only call gdk_cairo_set_source_color()
when the element colour changes.

svn path=/trunk/; revision=43998
2012-07-25 15:11:14 +00:00
Jakub Zawadzki 7d900f7450 Fix bug #7347: "Resize All Columns" fails in Time Column
If column is based on frame data packet_list_get_widest_column_string() 
was constructing his own frame_data with biggest *value* for given column
(which might be not the longest string) and later fill column for it.

Which generally should work (time precision is fixed),
but in r41185 to lot col_*() function was added check if fd->flags.has_ts is set.
packet_list_get_widest_column_string() was passing frame_data with flags.has_ts unset.

To make maintaince easier, instead of fixing the problem with flags.has_ts,
generate column buffer for each frame, and find the one which has longest string.


svn path=/trunk/; revision=43991
2012-07-25 12:52:47 +00:00
Alexis La Goutte f4f8e88ae9 lupdate QtShark.pro (with the last change in translation and help menu)
Updating 'qtshark_de.ts'...
   Found 69 source text(s) (23 new and 46 already existing)
Updating 'qtshark_fr.ts'...
   Found 69 source text(s) (25 new and 44 already existing)    Kept 1 obsolete entries

There is new string to translate....

svn path=/trunk/; revision=43989
2012-07-25 12:00:38 +00:00
Alexis La Goutte e9c6f329c0 Add some link (URL) to Help Menu in QtShark
* Use QtAutoconnect feature
* no (yet ?) use help_dlg.* function (topic_action, topic_online_url...)


svn path=/trunk/; revision=43988
2012-07-25 11:57:05 +00:00
Alexis La Goutte dece67951b Add some link (URL) to Help Menu in QtShark
* Use QtAutoconnect feature
* no (yet ?) use help_dlg.* function (topic_action, topic_online_url...)


svn path=/trunk/; revision=43987
2012-07-25 11:53:44 +00:00
Alexis La Goutte d31651c42c Add Help Menu to QtShark
* with new "item" Ask A&Q (not yet available in GTK Gui)
* No yet link (next step)
* No icon...


svn path=/trunk/; revision=43986
2012-07-25 11:49:03 +00:00
Martin Mathieson d14fa0eb0f When zooming in, never subdivide whole numbers on the Y axis (they are
sequence numbers).

svn path=/trunk/; revision=43980
2012-07-25 02:56:51 +00:00
Martin Mathieson 2286e329b2 Don't increase refnum unless graph is created. Also, don't allocate
graph until know that we were able to choose a TCP session.
This could fail if e.g. a MAC LTE frame had > 1 bearers carrying TCP
segments.

svn path=/trunk/; revision=43977
2012-07-25 00:07:47 +00:00
Martin Mathieson b342ac680d Don't leak the graph (or skip a graph refnum) if single RLC channel not
found in selected frame in the packet list.

svn path=/trunk/; revision=43972
2012-07-24 22:43:10 +00:00
Jakub Zawadzki fcb17c5558 Make proto_tree_draw wrapper function to proto_tree_draw_resolve.
svn path=/trunk/; revision=43966
2012-07-24 19:49:47 +00:00
Anders Broman 88f8b100a2 Analyze->Apply as Filter and Analyze->Prepare a Filter cause crashes
user_data is NULL in the callbacks from the menu_bar, and when preparing filters we need to find the filter widget with g_object_get_data(G_OBJECT(data), E_DFILTER_TE_KEY).
The object is saved in the global variable popup_menu_object.
Use that in the filter callbacks from the menu bar.
- remove unused widget from a couple of callbacks.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7506

svn path=/trunk/; revision=43961
2012-07-24 15:03:59 +00:00
Anders Broman 2e74809c33 Reinsert conversation colorization shortcuts
svn path=/trunk/; revision=43953
2012-07-24 05:51:42 +00:00
Jakub Zawadzki 045b5b03ce Fix bug #7520: Byteview related Glib-GObject-Critical msgs during GTK2 Wireshark startup
Put generated, with *proper* types version of marshaler (VOID:OBJECT,OBJECT) inside bytes_view.c
It was also only blocker of #undef GTK_DISABLE_DEPRECATED, so remove it.

XXX generated version of marshaler looks portable, but it'd be best to generate it using
glib-genmarshal during compilation.

svn path=/trunk/; revision=43947
2012-07-23 20:24:36 +00:00
Anders Broman e5969b3317 Dynamicly allocate " items".
make it a gpointer and cast to io_item_t items where needed.
The ame is to make io_stat_graph_t generic and reusable.

svn path=/trunk/; revision=43925
2012-07-23 10:10:40 +00:00
Anders Broman 33f2e1cbb3 Align structs and code a bit, ultimatly code should be shared.
svn path=/trunk/; revision=43924
2012-07-23 07:55:15 +00:00
Martin Kaiser 048fcbdf2f initialize required interface_t components of a newly created interface
this should fix crashes in the interface list handling when the
interface list contains pipes initliazed by scan_local_interfaces() or
add_pipe_cb()

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7511

svn path=/trunk/; revision=43922
2012-07-22 22:09:46 +00:00
Jakub Zawadzki 5c75ecd424 Continuation of r43338, value stored in record->col_text_len always fit in gushort.
svn path=/trunk/; revision=43919
2012-07-22 21:12:16 +00:00
Jakub Zawadzki ac46b9cf5b Fix some memory leaks of returned string from gtk_combo_box_text_get_active_text()
gtk_combo_box_text_get_active_text() and gtk_combo_box_get_active_text() [from old-gtk-compat.h]
returns *newly allocated string (...) must be freed with g_free().*

svn path=/trunk/; revision=43918
2012-07-22 21:06:46 +00:00
Michael Tüxen 830283048b Get rid of a GTK warning showing up when wireshark is started.
svn path=/trunk/; revision=43916
2012-07-22 16:41:59 +00:00
Evan Huus afec796598 Two little cleanups from cppcheck:
- unused variable
= don't trust GTK_IS_PROGRESS_BAR to provide the necessary parentheses

svn path=/trunk/; revision=43915
2012-07-22 15:58:36 +00:00
Martin Mathieson 21f096d984 Fix horizontal line that gets drawn from the last ACK to the r.h. edge
of the graph (when the last SN hasn't been acknowledged).

svn path=/trunk/; revision=43910
2012-07-22 05:13:49 +00:00
Martin Mathieson c86f69801f Delete stray debug printf() call left in last commit.
svn path=/trunk/; revision=43909
2012-07-22 04:45:14 +00:00
Martin Mathieson 7b7ab4c70e Don't scale sequence numbers back to 0 (like TCP does). I want to see
the real sequence number.  TODO: show the absolute time...

svn path=/trunk/; revision=43900
2012-07-21 17:21:19 +00:00
Gerald Combs d6533eb467 Add display filter and name resolution controls to the standard Qt open
file dialog. We still need to add a preview.

svn path=/trunk/; revision=43879
2012-07-21 01:21:41 +00:00
Gerald Combs 75564d57c1 Remove the filename from the GTK+ open file preview.
svn path=/trunk/; revision=43878
2012-07-21 01:18:57 +00:00
Gerald Combs b0a562b82d Remove the filename from the Win32 file dialog preview. It's already
shown in two places and there's no reason to show it in a third.

Use CommDlg_OpenSave_GetFilePath instead of CommDlg_OpenSave_GetSpec so
that previews work properly for folders.

svn path=/trunk/; revision=43877
2012-07-21 01:14:08 +00:00
Jakub Zawadzki 73b0691fd8 gtk_container_add() -> gtk_box_pack_start() [bug #7377]
svn path=/trunk/; revision=43874
2012-07-20 21:35:45 +00:00
Jakub Zawadzki e4b07c11d4 Decode as: Don't add notebook twice to hbox (fix r43825)
svn path=/trunk/; revision=43873
2012-07-20 21:34:23 +00:00
Jakub Zawadzki d1500622fc Fix bug #7377 for:
- UAT
 - Packet in new window
 - Supported protocols dialog.

svn path=/trunk/; revision=43861
2012-07-20 15:21:40 +00:00
Jakub Zawadzki 5eee82d32f For all recent changes (r43820...r43829) from gtk_container_add() to gtk_box_pack_start() set expand parameter to TRUE.
svn path=/trunk/; revision=43860
2012-07-20 15:08:27 +00:00
Jakub Zawadzki 5b7e9a9152 BytesView: use "view" class (GtkTextView) instead of "entry" (GtkEntry) one.
Cheat a little and always make BytesView focused to make render blue-highlight instead of grey /inactive/ one.

XXX, we should have our own BytesView class and allow user define his own style in css.

svn path=/trunk/; revision=43859
2012-07-20 13:59:57 +00:00
Jörg Mayer 6ac0c92fb4 Order alphabetically
svn path=/trunk/; revision=43858
2012-07-20 12:00:37 +00:00
Jörg Mayer 964008c959 Add qtshark_de.ts
svn path=/trunk/; revision=43857
2012-07-20 11:59:25 +00:00
Jakub Zawadzki 642861a4e1 Fix bug #7502
In gtk3 upper value of adjustment can't be smaller than page_size.
Otherwise strange things happens ;-)

svn path=/trunk/; revision=43856
2012-07-20 11:59:20 +00:00
Jörg Mayer 0441109c33 Beginnings of a German translation (review/improvements welcome)
svn path=/trunk/; revision=43855
2012-07-20 11:58:16 +00:00
Jakub Zawadzki 98c2390515 Fix some clang warnings: implicit conversion from enumeration type 'GtkStateType' to different enumeration type 'GtkStateFlags' [-Werror,-Wconversion]
GTK_STATE_NORMAL and GTK_STATE_FLAG_NORMAL are both 0.

svn path=/trunk/; revision=43854
2012-07-20 11:10:29 +00:00
Jörg Mayer 0062536fa8 progress_dialog.* -> progress_bar.*
svn path=/trunk/; revision=43852
2012-07-20 10:35:51 +00:00
Guy Harris c5ccddaa25 Need old-gtk-compat.h for gtk_widget_get_window() in older versions of
GTK+.

svn path=/trunk/; revision=43838
2012-07-19 23:08:18 +00:00
Gerald Combs c71e796349 Try to fix compilation on non-Windows systems.
svn path=/trunk/; revision=43837
2012-07-19 23:07:17 +00:00
Guy Harris 7031122dc4 Reflect the name change of progress_dialog.{cpp,h} to progress_bar.{cpp,h}.
svn path=/trunk/; revision=43836
2012-07-19 23:04:46 +00:00
Gerald Combs cbb9966466 Remove some debugging statements. Fix the fade-in animation.
svn path=/trunk/; revision=43835
2012-07-19 22:33:47 +00:00
Gerald Combs 0da59a0058 Pass {delayed_}create_progress_dlg a pointer the top level window
so that we can properly associate a widget with create, update, and
destroy events. Only used by Qt so far but it should be easy enough to
add to GTK+.

Rename ui/qt/progress_dialog.{h,cpp} to progress_bar.{h,cpp}. Show a
progress bar in the status bar of the main window instead of creating
a separate dialog. Note that we still need to add a "cancel" mechanism
and display the task and item titles somewhere.

Thus began the War Against Gratuitous Dialogs.

svn path=/trunk/; revision=43833
2012-07-19 21:49:52 +00:00
Anders Broman 1d164df472 gtk_container_add() -> gtk_box_pack_start().
svn path=/trunk/; revision=43829
2012-07-19 15:02:07 +00:00
Anders Broman aa1dd4546d Shoul be gtk_box_pack_start(GTK_BOX (vbox), message_type_fr, TRUE, TRUE, 0);
svn path=/trunk/; revision=43828
2012-07-19 14:02:47 +00:00
Anders Broman 39747fc669 Shoul be gtk_box_pack_start(GTK_BOX (vbox), message_type_fr, TRUE, TRUE, 0);
svn path=/trunk/; revision=43827
2012-07-19 13:36:26 +00:00
Anders Broman 42cb0dd606 Remove unused variable.
svn path=/trunk/; revision=43826
2012-07-19 13:10:17 +00:00
Anders Broman d3ecc1431f gtk_container_add() -> gtk_box_pack_start().
svn path=/trunk/; revision=43825
2012-07-19 13:06:04 +00:00
Jakub Zawadzki 58d106382a Use define instead of string constant.
svn path=/trunk/; revision=43824
2012-07-19 12:49:42 +00:00
Jakub Zawadzki 3c80b32e54 BytesView: use GtkStyleContext for gtk-3 (bug #7502)
svn path=/trunk/; revision=43823
2012-07-19 12:41:44 +00:00
Jakub Zawadzki 3fd00ae4e7 Fix bug #7377 for 'Protocol Hierarchy' and 'Endpoints'
svn path=/trunk/; revision=43822
2012-07-19 11:47:00 +00:00
Jakub Zawadzki dce9b3baec BytesView: Support for gtk3 scrollbar.
svn path=/trunk/; revision=43821
2012-07-19 11:03:54 +00:00
Anders Broman e6c5c00453 gtk_container_add() -> gtk_box_pack_start().
svn path=/trunk/; revision=43820
2012-07-19 10:36:56 +00:00
Anders Broman 3be9409ae8 From Jakub Zawadzki use gtk_box_pack_start isof gtk_container_add fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7377
svn path=/trunk/; revision=43790
2012-07-18 19:44:54 +00:00
Jörg Mayer ebccbb0829 Get rid of the problems described in bug7377
Bissecting shows, that the problem was introduced by commit

r43009 | etxrab | 2012-06-03 01:53:04 +0200 (So, 03 Jun 2012) | 1 line

From Evan Huus Convert a bunch more GTK-2 calls to their cross-version ws_ equivalent

To get the problems back, compile with -DBREAK_GTK3


svn path=/trunk/; revision=43787
2012-07-18 17:38:19 +00:00
Gerald Combs 2643a5b02d Update qtshark to match the recent file dialog changes.
svn path=/trunk/; revision=43786
2012-07-18 16:40:34 +00:00
Gerald Combs e1bf3c011e Fill in our display filter after we open a file.
svn path=/trunk/; revision=43785
2012-07-18 15:29:13 +00:00
Evan Huus a234b68ff0 Fix some system header files that were #included with "" instead of <>.
They made cppcheck unhappy.

svn path=/trunk/; revision=43779
2012-07-18 02:47:56 +00:00
Guy Harris 3074044f77 Set the folder to the containing directory of the file name in question,
not to the file itself (the file itself will be a plain file, so that
will fail).

svn path=/trunk/; revision=43776
2012-07-17 21:44:41 +00:00
Jakub Zawadzki b4ec6ba914 Fix comments, from r43729 we don't load bold font.
svn path=/trunk/; revision=43773
2012-07-17 20:52:16 +00:00
Chris Maynard ae8d9d4461 Fix Coverity CID 709722: Logically dead code.
svn path=/trunk/; revision=43770
2012-07-17 19:43:08 +00:00
Jörg Mayer 83a22a220a Now it compiles with 2.24 - hopefuly it will even work
svn path=/trunk/; revision=43767
2012-07-17 14:52:42 +00:00
Jörg Mayer 6bd20171ef Bring compilation with gtk 2.24 one step further (not yet working)
svn path=/trunk/; revision=43766
2012-07-17 14:33:06 +00:00
Gerald Combs 0f0b5efcc1 Pass the correct widget to gtk_open_file. If we're filling in a display
filter make sure we check its syntax. Return a boolean.  --This line,
and those below, will be ignored--

M    ui/gtk/capture_file_dlg.c

svn path=/trunk/; revision=43757
2012-07-16 21:01:16 +00:00
Gerald Combs 281e18d636 Move most of file_open_cmd to gtk_open_file. Make gtk_open_file
and win32_open_file behave similarly. _snwprintf is "banned". Use
StringCchPrintf instead. Tested on Windows. I'll test on OS X shortly.

svn path=/trunk/; revision=43756
2012-07-16 20:46:13 +00:00
Jakub Zawadzki 42f423fcce - Restore optimization of drawing only lines in clipping area
- Fix compilation for < gtk-2.14

svn path=/trunk/; revision=43745
2012-07-16 09:56:53 +00:00
Jakub Zawadzki 009a1a3614 Compilation fixes for gtk-3.x + for gtk-2.x use clipping region not area.
svn path=/trunk/; revision=43744
2012-07-16 09:18:33 +00:00
Jakub Zawadzki 7a2ba09d14 - Make it compile gtk-2.24 with GSEAL_ENABLE enabled
- ->draw for gtk-3.x (NOT TESTED!!!)

svn path=/trunk/; revision=43743
2012-07-16 08:35:04 +00:00
Jakub Zawadzki aaa4688e3a Some gtk-3.0 fixes.
svn path=/trunk/; revision=43742
2012-07-16 07:26:00 +00:00
Martin Mathieson 2d38d90b3e Don't create and destroy a cairo context for each line and ellipse when
redrawing the graph.

Don't mess around with a static pointer when allocating segments. This
seems unecessary and can result in the last one being leaked.

These changes were already made to rlc_lte_graph.c, which is based upon
the tcp graph code.

svn path=/trunk/; revision=43740
2012-07-16 03:05:35 +00:00
Guy Harris 7736e72e1d <gtk/gtkmarshal.h> doesn't appear to be necessary, at least with GTK+
2.24.5.  Remove the include of it.

Get rid of duplicate #undefs of GTK_DISABLE_DEPRECATED and GSEAL_ENABLE
- nothing in config.h should depend on them.

Make at least some of the changes that

	http://developer.gnome.org/gtk3/stable/ch24s02.html#id1459694

and

	http://developer.gnome.org/gtk3/stable/ch24s02.html#id1459754

seem to indicate we need to make for GTK+ 3.

svn path=/trunk/; revision=43739
2012-07-16 02:42:44 +00:00
Guy Harris 95060ffa5d The CMake builds in the Ubuntu buildbot appear to be building with GTK+
3; if so, that might indicate that GTK+ 3 doesn't have gtkmarshal.h. 
Try not attempting to include it with GTK+ 3.x - if that causes other
failures, well, I guess that means that, when building the BytesView
widget under GTK+ 3, we can't use the gtk_marshal_ functions....

svn path=/trunk/; revision=43737
2012-07-16 01:54:32 +00:00
Guy Harris 268520b707 For the encoding and format, use the enum types.
Add some comments.

svn path=/trunk/; revision=43736
2012-07-16 01:49:01 +00:00
Guy Harris 6469a1d606 Get rid of probably-unnecessary parentheses around the expansion of
gtk_widget_get_allocation() (gtk_widget_set_window() doesn't have them),
but *do* put parentheses around its "x" argument.

Fix gtk_widget_set_allocation() to set the allocation.

svn path=/trunk/; revision=43735
2012-07-15 23:20:34 +00:00
Jakub Zawadzki 19c7ee7ae2 Fix some gseal warnings.
svn path=/trunk/; revision=43734
2012-07-15 21:57:08 +00:00
Guy Harris 3408bf4038 Get rid of unnecessary include.
svn path=/trunk/; revision=43733
2012-07-15 21:53:50 +00:00
Guy Harris 205165dfb8 Squelch some more warnings with explicit casts.
svn path=/trunk/; revision=43732
2012-07-15 21:22:09 +00:00
Guy Harris 6bf7a66b29 Try gdouble here, to see if it removes "gdouble to gfloat" warnings with
MSVC.

svn path=/trunk/; revision=43731
2012-07-15 21:19:42 +00:00
Jakub Zawadzki 951fd55af3 Fix win* buildbot warnings:
packet_panes.c(304) : error C2220: warning treated as error - no 'object' file generated
packet_panes.c(304) : warning C4244: 'function' : conversion from 'gdouble' to 'int', possible loss of data
packet_panes.c(304) : warning C4244: 'function' : conversion from 'gdouble' to 'int', possible loss of data

Add casts, old code did the same casts so this should be OK.

svn path=/trunk/; revision=43730
2012-07-15 20:48:40 +00:00
Jakub Zawadzki 1279b87345 user_font_get_bold() is no longer needed, remove it.
svn path=/trunk/; revision=43729
2012-07-15 20:29:22 +00:00
Jakub Zawadzki b69c48df5a Fix bug #6690: Wireshark quite slow displaying frames with many detail pane nodes and large byteviews
Add custom widget to render hexdump or bitsdump.

svn path=/trunk/; revision=43728
2012-07-15 20:24:48 +00:00
Anders Broman 5d9d9b8221 From Wonil Kim: Enable statistics menu register for the tap plug-in. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7466
svn path=/trunk/; revision=43726
2012-07-15 16:24:35 +00:00
Pascal Quantin 5ca89cfed3 Sanity checks to avoid a crash if no file is open
svn path=/trunk/; revision=43717
2012-07-14 19:59:13 +00:00
Martin Mathieson b92733dc39 Add some comments, remove more left-overs from tcp_graph.c.
svn path=/trunk/; revision=43687
2012-07-13 00:35:18 +00:00
Gerald Combs bc1b0fd21d Try not to print funny characters.
svn path=/trunk/; revision=43685
2012-07-12 23:39:25 +00:00
Gerald Combs 5d4638e95c Fix building (and running) on OS X.
svn path=/trunk/; revision=43684
2012-07-12 22:39:04 +00:00
Gerald Combs bdea70585d Use win32_open_file in qtshark on Windows.
svn path=/trunk/; revision=43677
2012-07-12 00:04:53 +00:00
Gerald Combs c7c73e44b5 MSDN says DIALOG resources are obsolete. Use DIALOGEXes instead. We aren't
adding extra controls to the save dialog any more so remove its template.

svn path=/trunk/; revision=43676
2012-07-11 21:25:42 +00:00
Anders Broman 6980e9474b e_addr_resolve has a new member.
svn path=/trunk/; revision=43660
2012-07-11 10:39:49 +00:00
Martin Mathieson 5ad8cf408a Speed up line drawing by no longer creating and destroying a cairo_t
object for each line - rather create one and use it for the entire list,
then destroy it.

Simplify the allocation of segments, by no longer messing around with a
static that may or may not be used.  Also, there was a good chance the
last one would be leaked (if it was not part of the stream we are
interested in).

Note that both of these improvements would also apply to tcp_graph.c -
will wait a couple of days to be sure the changes are good.

svn path=/trunk/; revision=43654
2012-07-11 02:43:00 +00:00
Anders Broman 59a4393cc8 Update the packet list and details if name resolution is changed.
svn path=/trunk/; revision=43646
2012-07-10 14:48:23 +00:00
Anders Broman c59ae18df7 Update the /View/NameResolution menu when activated in case the
settings has ben altered elswhere in the GUI.

svn path=/trunk/; revision=43644
2012-07-10 14:01:36 +00:00
Jeff Morriss 83ac7ca8ae From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7461 :
When showing the TCP (and UDP and other protocols) port numbers in the
framelist columns, they are left aligned. This is sub-optimal if you are
scanning the list for a certain port.

This patch, very small, will properly right justify these numbers:
UNRESOLVED DST PORT
UNRESOLVED SRC PORT
DST PORT
SRC PORT

svn path=/trunk/; revision=43642
2012-07-10 13:22:46 +00:00
Anders Broman 7003dbae37 From Martin Kaiser:
Add rlc_lte_graph.c

svn path=/trunk/; revision=43640
2012-07-10 11:37:25 +00:00
Anders Broman 81531a65dd Change the button order in all places.
svn path=/trunk/; revision=43639
2012-07-10 07:50:34 +00:00
Martin Mathieson 3658990eb5 Trivial indentation fixes.
svn path=/trunk/; revision=43636
2012-07-10 02:19:34 +00:00
Guy Harris 4fad38dbd2 From Evan Huus:
Fix an uninitialized-variable error that was breaking compile with gcc.

Also remove some cruft that looks like it was copy-pasted from
ui/gtk/tcp_graph.c

Fixes bug 7460.

svn path=/trunk/; revision=43635
2012-07-10 01:57:55 +00:00
Martin Mathieson 3599fe0daf Add a sequence graph for LTE RLC channels under Telephony | LTE.
svn path=/trunk/; revision=43634
2012-07-10 01:32:54 +00:00
Jeff Morriss 188d7d0f4a As suggested by Richard Sharpe: rename VALS_GROUP_NAMES[] so it's not all
upper case.

Don't mark stat_group_name()'s 'group' parameter unused: it is unused.

svn path=/trunk/; revision=43627
2012-07-09 20:45:14 +00:00
Anders Broman f090a73e9c From Michael Mann:
disable hide checkboxes with error messages

Updated preference dialog to include text if hide checkbox is disabled.

Used error message for "Local Interfaces" dialog.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2598

svn path=/trunk/; revision=43622
2012-07-09 02:40:20 +00:00
Anders Broman 4fd366e321 From Evan Huus:
IO Graph Fixes

- Allow counting *any* type of field, FT_NONE, FT_PROTOCOL, whatever, by moving
FT_NONE case to default case per Jakub's suggestion.

- Fix get_it_value() for FT_PROTOCOL fields by breaking CALC_TYPE_COUNT_FRAMES
and CALC_TYPE_COUNT_FIELDS out of the adv_type switch statement just like
COUNT_TYPE_FRAMES.

- Avoid an overflow in pixmap_clicked_event() that was causing crashes when
clicking outside the data portion of the graph (when the capture hasn't enough
files to fill the entire graph window),

svn path=/trunk/; revision=43621
2012-07-09 02:33:39 +00:00
Anders Broman e0d9282f86 From Evan Huus:
Redundant conditions in iax2_analysis.c

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7456

svn path=/trunk/; revision=43618
2012-07-09 02:02:03 +00:00
Anders Broman 45e9efc6a9 From Evan Huus:
Fix leaks

- don't g_strdup a string just to use it in a g_strdup_printf
- clean up properly in error cases in lua bindings
- misc. other missing g_free() calls
- one missing fclose() in the new 80211_utils

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7454

svn path=/trunk/; revision=43617
2012-07-09 01:56:27 +00:00
Anders Broman 1ae38887b6 From Evan Huus:
Grab-bag of unused variables.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7452

svn path=/trunk/; revision=43616
2012-07-09 01:49:02 +00:00
Anders Broman 0696f30690 From Michael Mann:
GUI use external name resolver proliferation

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7380

svn path=/trunk/; revision=43615
2012-07-09 01:36:54 +00:00
Jeff Morriss 8f12c9d7d7 First phase of fixing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7380 :
Add a new name resolution option: whether or not use the configured (in the OS)
name resolver (e.g., DNS) to resolve network names.  When this option is disabled
but network name resolution is enabled then Wireshark will resolve only those
names that it can from local sources.  This includes (at least, AFAIK):

- name resolutions that Wireshark picks up on from DNS packets it decodes
- the "user hosts file" (~/.wireshark/hosts on *NIX)
- what Wireshark reads out of capture file (the PCAPNG name resolution block)

This new preference defaults to "use external resolvers" for backward
compatibility (so people turning on network name resolution will get the old
behavior).

This option can be set via Edit->Preferences and on the command line; there
remain several UIs (e.g., the "open capture file" dialog, the
View->Name Resolution menu, etc.) that don't have the new option yet.


Also expand on the "description" for the name resolution preferences: these
are used not only in the tooltips but are also written to the preferences
file.  The previous text didn't include enough context when written do the
preferences file.

svn path=/trunk/; revision=43605
2012-07-08 01:31:48 +00:00
Guy Harris 659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
Guy Harris 1b1fbd24e7 From Evan Huus:
There is no guarantee that uat->category is non-null, so check whether
it's null before checking whether it's UAT_CAT_FIELDS or not.

Fixes bug 7444.

#BACKPORT

svn path=/trunk/; revision=43602
2012-07-07 22:40:02 +00:00
Jeff Morriss 9a2dc60d72 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7445 :
"Find Next Mark" was duplicated in the Edit menu and "Find Previous Mark" was
missing (the 2nd "Find Next Mark" would, if selected, find the previous mark).

svn path=/trunk/; revision=43600
2012-07-07 14:54:14 +00:00
Guy Harris ef825ec6d3 Only one place is needed for creating preference panes; this clears up
some warnings from GTK+.

For interior nodes in the preference module tree, we create a page even
if the module itself has no preferences, so there's *something* we can
show if the user clicks on it.  (Showing the top-level protocols page is
a bit weird, and requires us to keep track of it.)

svn path=/trunk/; revision=43596
2012-07-07 02:49:17 +00:00
Guy Harris ab5e6696e1 Uniformly use two-space indents (most of the file uses it).
svn path=/trunk/; revision=43593
2012-07-07 00:41:12 +00:00
Guy Harris 47dba62a84 As per Michael Mann's email:
Yes, the following files can now be deleted:
 
	\wireshark\ui\gtk\prefs_nameres.c
	\wireshark\ui\gtk\prefs_nameres.h
	\wireshark\ui\gtk\prefs_print.c
	\wireshark\ui\gtk\prefs_print.h
	\wireshark\ui\gtk\prefs_protocols.c
	\wireshark\ui\gtk\prefs_protocols.h
	\wireshark\ui\gtk\prefs_taps.c
	\wireshark\ui\gtk\prefs_taps.h
 
	I thought removing them was part of the patch for bug 7402, but
	they still show up in the SVN (perhaps I didn't create the patch
	correctly).

Make it so.

svn path=/trunk/; revision=43591
2012-07-06 23:21:03 +00:00
Jakub Zawadzki c383e6f115 Fix logic typo, it should fix bug #7434
svn path=/trunk/; revision=43588
2012-07-06 17:02:08 +00:00
Pascal Quantin 7e38fe433a Fix compilation with gcc 4.3.2 and without GEOIP
svn path=/trunk/; revision=43587
2012-07-06 12:25:54 +00:00
Jakub Zawadzki f31b3943c0 - e_addr_resolve is structure so pass it by pointer.
- name_resolve_concurrency must be only defined when used.

svn path=/trunk/; revision=43584
2012-07-06 07:34:08 +00:00
Anders Broman c19583b72c From Michael Mann:
Generic preferences implementation - Printing and Name Resolution.

svn path=/trunk/; revision=43579
2012-07-06 04:48:36 +00:00
Martin Mathieson 4c647041d4 Take yet more care not to be dividing by zero when calculating the bit
rate of the channel/UE. Times four... 

svn path=/trunk/; revision=43578
2012-07-06 01:52:09 +00:00
Guy Harris 918e00880c From Pontus Fuchs:
Remove refresh button from wireless toolbar

   With a "refresh interfaces" menu option and device hotplug
   notification in place there is no longer need for a refresh
   button in the toolbar.

svn path=/trunk/; revision=43570
2012-07-05 05:36:50 +00:00
Guy Harris b1ab794baa From Pontus Fuchs:
Refresh wireless toolbar too

    The recently improved refresh interfaces code forgot the wireless
    toolbar. Make sure to refresh it too.

svn path=/trunk/; revision=43568
2012-07-05 02:01:43 +00:00
Guy Harris eb38ae49b1 From Pontus Fuchs:
Fix wireless toolbar

    The compilation fix for mac got it slightly wrong:

    s/HAVE_PCAP/HAVE_LIBPCAP/

svn path=/trunk/; revision=43567
2012-07-05 01:59:00 +00:00
Jakub Zawadzki 8c1d02377e Fix bug #7425: Per-packet right-click network or MAC name resolution not working
proto_tree_draw() from r43189 is lazy, and it don't fills tree with all item labels.
To fix it, move 'gbl_resolv_flags' hack to proto_tree_model_get_value().

XXX could we pass resolving flags to proto_item_fill_label()?


svn path=/trunk/; revision=43550
2012-06-30 10:43:50 +00:00
Guy Harris 3a4678b00f Separate the code for each column in the interface list with blank
lines.

svn path=/trunk/; revision=43549
2012-06-30 00:32:03 +00:00
Guy Harris 7546a033c7 Clarify *which* capture dialogs are handled by capture_dlg.c.
svn path=/trunk/; revision=43548
2012-06-29 22:52:13 +00:00
Jeff Morriss f01a28135f Clean up capture option tooltip spacing and remove an extraneous word (at the end of the monitor mode description). Also use sizeof for a buffer size.
svn path=/trunk/; revision=43547
2012-06-29 21:18:35 +00:00
Guy Harris 021b749051 ui/gtk/iface_lists.c no longer needs <wsutil/file_util.h>, as the
"determine the interface type" code moved to capture_ifinfo.c.

svn path=/trunk/; revision=43544
2012-06-29 18:03:17 +00:00
Jakub Zawadzki b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Guy Harris 9d90dc5e8f Move if_list_comparator_alph() to iface_lists.c; it's used in several
places.

svn path=/trunk/; revision=43534
2012-06-28 20:52:26 +00:00
Guy Harris cccc9f0a2d If we don't have AirPcap, don't bother with the IF_AIRPCAP case; if we
ever add support for it on additional platforms, HAVE_AIRPCAP will be
defined.

svn path=/trunk/; revision=43533
2012-06-28 20:40:44 +00:00
Guy Harris c51a19cc43 get_interface_type() contains no GUI code, so just move it up to
capture_ifinfo.c.

svn path=/trunk/; revision=43532
2012-06-28 20:16:39 +00:00
Guy Harris 8381581aa1 capture_get_if_icon() is no longer platform-dependent; the
platform-dependent work is now done in get_interface_type().

That means we also don't need to protect the handling of IF_DIALUP or
even IF_AIRPCAP in #ifdefs, just in case we add support for those types
in other OSes.

Nothing's uisng the capture_ethernet_16.xpm image here, so don't bother
including it.  (Does *anybody* use it?  I couldn't find any uses, but
maybe we should use that.)

svn path=/trunk/; revision=43531
2012-06-28 20:06:37 +00:00
Guy Harris 1ae8203b46 No pcap, no interfaces to monitor.
svn path=/trunk/; revision=43530
2012-06-28 19:10:40 +00:00
Guy Harris 5e077c6d6c <wsutil/file_util.h> is needed on Windows.
svn path=/trunk/; revision=43529
2012-06-28 19:09:22 +00:00
Guy Harris 05d6212a62 Make more routines static.
svn path=/trunk/; revision=43528
2012-06-28 19:08:11 +00:00
Guy Harris 6d5271b856 Make some routines static to ui/gtk/capture_dlg.c; they're not used
outside it.

svn path=/trunk/; revision=43527
2012-06-28 18:57:23 +00:00