Commit Graph

2232 Commits

Author SHA1 Message Date
Gerald Combs 46a0d3644d Try to make the animation a little more natural.
svn path=/trunk/; revision=52992
2013-10-31 00:01:51 +00:00
Gerald Combs 60d6458150 Move the geometry shenanigans a bit further ahead in the startup
sequence. Fix some prefs logic.

svn path=/trunk/; revision=52991
2013-10-30 23:54:46 +00:00
Gerald Combs b17d987960 Fix maximized geometry behavior on non-OS X systems.
svn path=/trunk/; revision=52990
2013-10-30 23:23:24 +00:00
Gerald Combs 8f21bfe46f Fix a comparison.
svn path=/trunk/; revision=52989
2013-10-30 23:14:11 +00:00
Gerald Combs 9075922f42 Add initial support for geometry settings in the main window.
In the current Qt startup sequence the main window + splash screen is
displayed before the main preferences are loaded which means we can't
immediately apply the correct geometry. For now, use an animation to
morph from the default to the saved geometry after the prefs are loaded.

Get rid of main_do_quit() (Qt) and main_window_exit() (Qt+GTK). It looks
like they were unused.

Add wsApp->isInitialized() and use it to see if we should exit() when
the main window is closed. Otherwise we won't shut the application down
and clean up properly.

svn path=/trunk/; revision=52988
2013-10-30 22:39:52 +00:00
Jeff Morriss aa452c378f Set SVN properties.
svn path=/trunk/; revision=52976
2013-10-30 00:43:46 +00:00
Irene Rüngeler 6d3988ffd3 Make the packet analysis for SCTP independent from GTK and QT.
svn path=/trunk/; revision=52945
2013-10-29 12:11:23 +00:00
Gerald Combs ba49d9bcf0 Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.

svn path=/trunk/; revision=52941
2013-10-29 04:05:27 +00:00
Gerald Combs 4e94bdcb85 Fix scroll bar ranges.
svn path=/trunk/; revision=52937
2013-10-28 23:57:57 +00:00
Gerald Combs 66558ef5a8 Remove some (but not all) U3 remnants.
svn path=/trunk/; revision=52935
2013-10-28 22:11:51 +00:00
Jeff Morriss d07f872c90 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9341 :
SVN rev 50525 tried to fix out-of-source-tree builds, but did so by
writing the .rcc.cpp files to the source tree. This was noticed when
running `make distcheck`. This patch reverts that behavior, and creates
the image/ directory to fix out-of-tree builds.

In other words, fix things so "make distcheck" with Qt works in out-of-tree
builds too.

svn path=/trunk/; revision=52926
2013-10-28 18:01:09 +00:00
Gerald Combs 3b7c0fffe4 More size and position tweaks.
svn path=/trunk/; revision=52913
2013-10-28 01:39:20 +00:00
Gerald Combs 5c65e00ca7 Try to improve the appearance of the sequence diagram.
Use integer coordinates for the arrows and text. Add smooth_font_size()
to qt_ui_utils which will hopefully adjust the size on Windows to
something more readable.

svn path=/trunk/; revision=52906
2013-10-27 22:23:27 +00:00
Michael Mann 8c64c5da89 Remove iplen and iphdrlen from struct _packet_info.
Dissectors should just use (reported) tvb length and taps have other ways to get the data.

svn path=/trunk/; revision=52899
2013-10-27 20:38:42 +00:00
Gerald Combs 69741d086b Remove U3 code and packaging.
svn path=/trunk/; revision=52896
2013-10-27 17:15:39 +00:00
Pascal Quantin ef24e09f5d From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9328 :
Suppress some VS2013 warnings when compiling gtk ui

svn path=/trunk/; revision=52880
2013-10-26 21:04:53 +00:00
Alexis La Goutte 5b28dba199 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52876
2013-10-26 17:20:18 +00:00
Gerald Combs 7a2de9f471 More sequence dialog updates.
Draw item labels and port numbers.  Update the hint text. Make items
selectable.  Resize fonts similar to the GTK+ version.  Add scrollbars.
Update the cursor.  Use pango_layout_set_ellipsize() in the GTK+ code.
Fixup comments.

svn path=/trunk/; revision=52855
2013-10-25 23:16:56 +00:00
Evan Huus 95f484a91e Add a very small hack to make the UAT update callback error string freeable, and
convert all existing UAT update callbacks to use glib memory instead of
ephemeral memory for that string.

UAT code paths are entirely distinct from packet dissection, so using ephemeral
memory was the wrong choice, because there was no guarantees about when it would
be freed.

The move away from emem still needs to be propogated deeper into the UAT code
itself at some point.

Net effect: remove another bunch of emem calls from dissectors, where replacing
with wmem would have caused assertions.

svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
Jeff Morriss 0cc2c88c2e Fix more SVN properties.
svn path=/trunk/; revision=52834
2013-10-25 01:25:23 +00:00
Jeff Morriss 787bca8ea0 Add SVN properties.
svn path=/trunk/; revision=52832
2013-10-25 00:56:17 +00:00
Evan Huus 29a4ebc5d4 Mark unused parameter, remove moved .h file from Makefile.common
svn path=/trunk/; revision=52831
2013-10-25 00:08:07 +00:00
Jörg Mayer 8a707b0af5 Fix properties
svn path=/trunk/; revision=52829
2013-10-24 23:52:58 +00:00
Jörg Mayer 61c7a1bc04 Make things compile again.
svn path=/trunk/; revision=52828
2013-10-24 23:47:30 +00:00
Gerald Combs 6131c00358 Add sequence_dialog.ui.
svn path=/trunk/; revision=52826
2013-10-24 23:11:09 +00:00
Gerald Combs cb3cfd1cf9 Add a missing dependency.
svn path=/trunk/; revision=52825
2013-10-24 23:01:30 +00:00
Gerald Combs 1a4033b63b Initial and woefully incomplete flow graph support.
Copy common code from ui/gtk/flow_graph.c and ui/gtk/graph_analysis.[ch]
to ui/tap-sequence-analysis.[ch]. Start using the name "sequence" in
places.

svn path=/trunk/; revision=52824
2013-10-24 22:52:30 +00:00
Michael Tüxen eec2feb91e Revert previous commit of Irene, which doesn't work (yet).
svn path=/trunk/; revision=52814
2013-10-24 14:32:22 +00:00
Irene Rüngeler 9188e54108 Move sctp_stat to ui to make it independent from gtk.
svn path=/trunk/; revision=52812
2013-10-24 09:36:33 +00:00
Michael Mann 36e13a4c55 Bugfix "Restart the running live capture" when using multiple files makes a long filename. Bug 2274 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2274)
Yes this solution leaks memory, but I think the handful of bytes leaked is worth fixing this nuisance.  Won't backport until leak is fixed though.

svn path=/trunk/; revision=52793
2013-10-23 15:31:48 +00:00
Jeff Morriss be86384b34 As suggested by Michael in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4605 :
Add a tooltip to tell users they can click to see the other IP addresses for
the selected interface.

svn path=/trunk/; revision=52792
2013-10-23 14:41:30 +00:00
Michael Mann bb25fad9de Add the ability to collapse subtrees with Shift+Left + additional menu items. Bug 9008 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9008).
Currently this is only for GTK, but allows users to test it to see if its worth adding to Qt (my personal opinion is yes).

From Jiří Engelthaler

svn path=/trunk/; revision=52790
2013-10-23 14:24:17 +00:00
Anders Broman b8003ea06e g_slist_free_full() is glib 2.28
Fix spelling.

svn path=/trunk/; revision=52787
2013-10-23 14:04:19 +00:00
Anders Broman e717ca06bd Make manual address resolution work again by putting the addresses
in a separate list and add that list when address resolution is rebuilt
during rescan of packets.

svn path=/trunk/; revision=52785
2013-10-23 12:02:15 +00:00
Irene Rüngeler 6e67565b2d Use the preferred or default linktype as active.
svn path=/trunk/; revision=52756
2013-10-22 10:36:12 +00:00
Pascal Quantin cc0bba9e4b Tentative fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9287 :
Initialize ofn->lCustData variable

svn path=/trunk/; revision=52740
2013-10-21 18:03:37 +00:00
Pascal Quantin cf9bbdecef From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9297 :
Add support for MSVC2013

svn path=/trunk/; revision=52716
2013-10-20 17:35:30 +00:00
Michael Mann 1554929862 Only allow one popup dialog in UAT dialog. Editing/copying/deleting can modify the uat list and other open dialogs will not be aware of it and lead to unexpected behavior (including crashes). Fixes bug 9129 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9129)
#BACKPORT(1.10)

svn path=/trunk/; revision=52683
2013-10-19 02:45:01 +00:00
Jeff Morriss 7ab98fb047 Get it actually building when we don't HAVE_LIBPCAP.
It would seem moc doesn't know about or pay attention to #ifdefs so take them
out of wireshark_application.h .

svn path=/trunk/; revision=52681
2013-10-18 21:47:05 +00:00
Jeff Morriss 3b1463d6b3 Clean up warnings when we don't HAVE_LIBPCAP.
svn path=/trunk/; revision=52680
2013-10-18 21:32:59 +00:00
Jeff Morriss d69a93f70e Simplify a bit (in a way which will hopefully actually work): just don't add -Wshorten-64-to-32 to CXXFLAGS. Also, add AM_CLEAN_FLAGS to AM_CXXFLAGS, not AM_CPPFLAGS.
svn path=/trunk/; revision=52676
2013-10-18 18:28:57 +00:00
Jeff Morriss 2ac63d7a44 Add -Wno-shorten-64-to-32 (if we can) when compiling the Qt UI.
svn path=/trunk/; revision=52674
2013-10-18 17:42:32 +00:00
Jeff Morriss db68b808dd Add AM_CLEAN_CFLAGS (-Werror) to AM_CPPFLAGS so we get notified of warnings in
the C++ stuff.

ui/qt/CMakeLists.txt adds -Wno-shorten-64-to-32 on 64-bit systems but it
doesn't seem necessary on Fedora 18 (64-bit).  Leaving it out for now--let's
see what others say...

svn path=/trunk/; revision=52673
2013-10-18 16:56:27 +00:00
Jörg Mayer 662c7704f8 After looking for something in the column-*.h files and
not finding it, I finally found it in column_info.h
Renamed column_info.h to column-info.h to have consistency
with the column*h files.

svn path=/trunk/; revision=52667
2013-10-18 13:06:05 +00:00
Gerald Combs fb9d4296be Adjust parenthesis to make gcc happy.
svn path=/trunk/; revision=52632
2013-10-15 21:31:32 +00:00
Gerald Combs 720de303c7 Add some missing parenthesis. Make sure we set our font in the right place.
Make the ColorUtils::fromColorT() convenience function a little more
convenient. Use it.

svn path=/trunk/; revision=52620
2013-10-15 15:22:03 +00:00
Gerald Combs bc3cd5611e Make sure we have a valid capture file pointer in win32_export_file().
Fixes bug 9271.

svn path=/trunk/; revision=52612
2013-10-15 01:10:52 +00:00
Gerald Combs 2b0c8b1c71 Fill in the help links. Make sure they do something when they're clicked.
Try to make the task list width match its contents.

svn path=/trunk/; revision=52611
2013-10-15 00:48:34 +00:00
Gerald Combs 4520cc08e1 Remove some commented code.
svn path=/trunk/; revision=52610
2013-10-15 00:17:23 +00:00
Gerald Combs 0efe942aab Let Qt lay out and size elements in FollowStreamDialog. Make it
resizable. Get rid of the group box -- the OS X and Windows HIGs
discourage its use and I'm not sure if it fits the GNOME HIG in this
case either. Make the stream contents monospace. Set the cursor to the
beginning of the text when we follow a stream.

Continue the War On Unnecessary Dialogs. Move "Find"ing from a pop-up
window to the main Follow dialog. Wrap back to the beginning as needed.

Add a "Cancel" button. Make sure it and the escape key work as expected.

svn path=/trunk/; revision=52607
2013-10-14 21:17:38 +00:00
Gerald Combs 13c1c9daf7 PacketList and ProtoTree need access to MainWindow at initialization
time in order to fill in their respective context menus. R52386 broke
that. Fix it and add comments about handling reparenting. Fixes bug
9265.

svn path=/trunk/; revision=52600
2013-10-14 16:54:41 +00:00
Cal Turney ee19aea96f SMB2 SRT can be very inaccurate in the presence of retransmissions: Retransmitted responses not only add additional (bogus) transactions but also the latency associated with them. This can greatly inflate the maximum and average SRT stats especially in the case of retransmissions triggered by the expiry of the rexmit timer (RTOs). Only calculating SRT for the first response received accomplishes this goal without requiring the TCP pref "Do not call subdissectors for error packets" to be set.
svn path=/trunk/; revision=52592
2013-10-13 20:19:30 +00:00
Graham Bloice 9c4ee86784 Add CMake properties to targets so that they are logically organised when using a Visual Studio solution.
Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution.

svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
Gerald Combs 522f74e9aa Have pixbuf_to_widget() use a guint8 * to match
gdk_pixbuf_new_from_inline().

svn path=/trunk/; revision=52562
2013-10-12 03:44:20 +00:00
Gerald Combs 1f2043d69c Solaris Studio C++ won't let us pass the address of main() to
init_progfile_dir(). Try using QCoreApplication::applicationFilePath()
instead.

svn path=/trunk/; revision=52559
2013-10-12 02:29:17 +00:00
Gerald Combs 90b20ab830 One more HAVE_LIBPCAP.
svn path=/trunk/; revision=52554
2013-10-11 21:42:49 +00:00
Gerald Combs 564ca2d5e9 Try to fix Qt compilation when libpcap is disabled.
svn path=/trunk/; revision=52552
2013-10-11 21:26:26 +00:00
Jeff Morriss 2dcfce371b Fix some formatting.
svn path=/trunk/; revision=52551
2013-10-11 20:48:13 +00:00
Gerald Combs a631772243 More ui/util.h includes.
svn path=/trunk/; revision=52545
2013-10-11 17:58:12 +00:00
Gerald Combs 3623167b81 Include ui/util.h.
svn path=/trunk/; revision=52544
2013-10-11 17:47:43 +00:00
Jeff Morriss 6262bb3f4d There's no need to include prefs.h twice.
svn path=/trunk/; revision=52543
2013-10-11 17:43:07 +00:00
Gerald Combs 259768dc1a Remove GTK+ and global cfile dependencies from file_dlg_win32.c.
Move the declaration of set_last_open_dir() to ui/util.h. It still
has separate GTK+ and Qt implemenations. We might want to move it to
ui/util.c at some point. Remove a lot of unnecessary GTK+ includes.
Remove most of the references to the global cfile while we're at it.

svn path=/trunk/; revision=52542
2013-10-11 17:20:50 +00:00
Jeff Morriss 561a0713d1 Don't close the Capture Options window if there was an error in what was
selected (and we're not going to start capturing).  That way the user can fix
whatever was wrong without having to re-open the dialog.

svn path=/trunk/; revision=52512
2013-10-10 20:23:59 +00:00
Chris Maynard 37a7e3382c Revert the changes made to resolve https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 (When following an HTTP tcp stream decode gzip data automatically), as they caused a bigger problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 ("Follow TCP Stream" shows only first HTTP req+res).
#BACKPORT(1.10)


svn path=/trunk/; revision=52506
2013-10-10 19:48:37 +00:00
Anders Broman d038be780b Flag the addresses used in the trace which has been resolved and only add those to the list used to create the NRB.
svn path=/trunk/; revision=52504
2013-10-10 19:17:48 +00:00
Gerald Combs 576a16004b When we display an error message in the interface list make sure it's
word-wrapped.

svn path=/trunk/; revision=52473
2013-10-09 17:58:39 +00:00
Michael Mann 9ccefb0ecd Prefix all "Wireshark application specific" display filters with a "_ws." to distinguish them from dissector filters.
This was committed now to get it into the 1.11 release so users can start getting used to the changed filter names.

svn path=/trunk/; revision=52462
2013-10-09 12:56:19 +00:00
Evan Huus 0faf9a0840 Rewrite the layout case statement as two separate ones, grouping and using
fallthrough to reduce the amount of duplication.

svn path=/trunk/; revision=52398
2013-10-06 13:22:12 +00:00
Michael Mann ee208c8dcc Add support for RELATIVE-OID ASN.1 type. Bug 9192 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9192)
From Ed Beroset.

svn path=/trunk/; revision=52393
2013-10-06 02:31:10 +00:00
Gerald Combs 0db37a0d2e Make the task list colors more consistent.
svn path=/trunk/; revision=52388
2013-10-05 22:47:43 +00:00
Gerald Combs c37cd6b66f Fix the white-rectangle-at-startup artifact with the help of GammaRay[1].
Make extra_split_ a member variable again. Make it and master_split_
full-on values. Set various parent/child relationships at startup
so that each widget is associated with a layout (which appears to be
the actual fix).

Make the throttled startup delay huge so that it's easier to browse
using GammaRay.

[1] https://github.com/KDAB/GammaRay

svn path=/trunk/; revision=52386
2013-10-05 22:39:49 +00:00
Martin Kaiser 67bae105de in a uat dialogue, allow only one popup for confirming a deletion of an
element

this should at least partially fix bug 9129

svn path=/trunk/; revision=52357
2013-10-04 12:52:36 +00:00
Michael Mann 12dd69e0b6 Remove check_col.
svn path=/trunk/; revision=52316
2013-10-01 15:14:59 +00:00
Gerald Combs a6f406ac5a Strip out references to PortAudio. Qt has its own audio module (Phonon).
We'll presumably use that.

svn path=/trunk/; revision=52282
2013-09-30 07:55:11 +00:00
Chris Maynard f216d4e440 When a line of text wraps to the next line, the character that caused the line to wrap was not being printed.
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=52221
2013-09-26 17:27:53 +00:00
Gerald Combs 80d1fde12a Delete extra_split if we're not using it. This keeps its handle from
showing up in the main window. Make it local to layoutPanes().

svn path=/trunk/; revision=52211
2013-09-25 00:26:36 +00:00
Gerald Combs 945901af70 address_equal → addresses_equal. Switch from address macros to functions
in the Qt code.

svn path=/trunk/; revision=52108
2013-09-16 21:33:26 +00:00
Gerald Combs f36c727fb0 Add stream information to the hint label. Update our hint more often.
Add a "to do" list.

svn path=/trunk/; revision=52102
2013-09-16 17:28:42 +00:00
Gerald Combs 29b63a71e6 Make sure we don't tap our packets twice. Give the graph has focus after
we redraw it.

svn path=/trunk/; revision=52095
2013-09-16 02:04:52 +00:00
Gerald Combs 0f6baaa805 Fix graph type selection.
svn path=/trunk/; revision=52094
2013-09-16 01:19:14 +00:00
Gerald Combs 6b251c7219 Another attempt at axis scaling. Tweak the appearance a little.
svn path=/trunk/; revision=52093
2013-09-16 00:50:23 +00:00
Gerald Combs 98479b0b17 When caclulating throughput, only subtract what we've added. Try to fix
axis scaling.

svn path=/trunk/; revision=52092
2013-09-15 23:55:51 +00:00
Martin Kaiser ca637dec68 mark unused parameter
svn path=/trunk/; revision=52091
2013-09-15 22:42:58 +00:00
Anders Broman c05e9683fd unused variable 'conversation'
svn path=/trunk/; revision=52088
2013-09-15 21:42:13 +00:00
Gerald Combs dd88e1ab26 Make sure the RTT behavior matches the GTK+ port. Make sure we properly
select a graph type.

svn path=/trunk/; revision=52083
2013-09-15 20:44:57 +00:00
Anders Broman 6653b82a98 Use a better hash algorithm and add a dialouge to get hastable data.
(missed a file)

svn path=/trunk/; revision=52079
2013-09-15 19:35:42 +00:00
Anders Broman 7f57fe3357 Use a better hash algorithm and add a dialouge to get hastable data.
svn path=/trunk/; revision=52078
2013-09-15 19:35:10 +00:00
Gerald Combs 7b03b59598 Mis-use error bars to draw segments.
svn path=/trunk/; revision=52029
2013-09-13 23:34:34 +00:00
Gerald Combs 7f92257af8 More TCP stream graph updates.
Scan our segment list (and the capture file) once per stream. Switch the
stream selection control to a QSpinBox. Add graph type selection
actions. The context menu + shortcuts should now be complete. Add the
intitial tcptrace graph. Only ACKs and RWINs so far. A bunch of other
updates and fixes.

svn path=/trunk/; revision=52027
2013-09-13 22:29:05 +00:00
Jörg Mayer e0d70f2ecc Include emem.h
svn path=/trunk/; revision=51999
2013-09-13 08:40:51 +00:00
Gerald Combs 1ad683594d Add a context menu to the TCP stream graph which includes all of our
keyboard shortcuts.

svn path=/trunk/; revision=51996
2013-09-12 23:46:56 +00:00
Gerald Combs c1e9555ad3 Try different arrow glyphs.
svn path=/trunk/; revision=51992
2013-09-12 22:04:37 +00:00
Jörg Mayer 2e9cd19c9c == has higher precedence than &
http://en.wikipedia.org/wiki/Operators_in_C_and_C++

svn path=/trunk/; revision=51990
2013-09-12 21:53:53 +00:00
Gerald Combs 07c3d057b8 Add previous/next stream navigation to the TCP stream graph dialog.
Add get_tcp_stream_count() to the TCP dissector and modify
graph_segment_list_get() to allow matching based solely on a stream.

Use text instead of icons for the mouse click behavior buttons. Remove
their PNG resources since we aren't using them any more. Fix setting the
cursor in the graph widget.

svn path=/trunk/; revision=51989
2013-09-12 21:37:47 +00:00
Gerald Combs a1203de69d Make sure qmake links with zlib on Windows.
svn path=/trunk/; revision=51961
2013-09-12 00:03:47 +00:00
Gerald Combs 34e2a96d0b Define NOMINMAX for the entire Qt build.
svn path=/trunk/; revision=51955
2013-09-11 19:59:22 +00:00
Martin Kaiser 52bcaf69af remove unused variable, mark unused parameter
svn path=/trunk/; revision=51954
2013-09-11 19:49:16 +00:00
Anders Broman e3cccd17f4 Get rid of some users the addrinfo_list.
svn path=/trunk/; revision=51953
2013-09-11 19:22:24 +00:00
Gerald Combs 6986eb4866 Move a lot of includes from follow_stream_dialog.h to
follow_stream_dialog.cpp. Remove the ones that we don't use. Use
QMessageBox in place of simple_dialog.

Move IP6OPT_HOME_ADDRESS and related definitions to packet-ipv6.c. It
looks like we only use it there and it conflicts with WinPcap.

Mark some items unused.

svn path=/trunk/; revision=51951
2013-09-11 17:39:49 +00:00
Gerald Combs 8daede4cf9 Make sure we can link on Windows.
svn path=/trunk/; revision=51949
2013-09-11 16:18:17 +00:00
Gerald Combs eb6d67d149 Use the correct GnuTLS include directory.
svn path=/trunk/; revision=51947
2013-09-10 22:25:41 +00:00
Gerald Combs ef6ad2800e Add a hack to allow builds to succeed on 64-bit systems.
svn path=/trunk/; revision=51945
2013-09-10 22:01:42 +00:00
Guy Harris 8646abfc17 It's such fun to have four count 'em four different build systems
(autotools, CMake, nmake, qmake).  Throw something at qmake in the hopes
of letting it use GnuTLS in the "follow SSL stream" code.

svn path=/trunk/; revision=51915
2013-09-10 01:18:09 +00:00
Evan Huus fca3bb6ad4 Restart the splash timer *after* the paint has completed, so that in situations
when the paint takes a long time (for very large windows, or on older machines)
that doesn't cause every single event to paint (which slows the whole thing to
a crawl). Drop the splash timer to 15ms, since we're no longer counting paints
this seems like a more appropriate value. The old value of 50ms would causing
the splash to only paint once or twice during startup.

svn path=/trunk/; revision=51914
2013-09-10 01:08:07 +00:00
Guy Harris 6a06b06006 Explicitly refer to ui/follow.h, as we do with other header files from
the ui directory, so see if that fixes the build issues.

svn path=/trunk/; revision=51913
2013-09-10 00:15:15 +00:00
Guy Harris 0df1640896 Get rid of a whole bunch of things that are supposed to be included by
source files rather than header files in most if not all cases.

svn path=/trunk/; revision=51908
2013-09-09 23:33:51 +00:00
Guy Harris bc48d52d04 "uni", in "unistd.h", stands for "Unix". Only include it if we have it,
which we don't on Windows.

svn path=/trunk/; revision=51905
2013-09-09 22:21:36 +00:00
Jeff Morriss fb6d18fe0d Set *.ts files' mime type to be XML; set svn properties on tools/pre-commit.
svn path=/trunk/; revision=51900
2013-09-09 21:24:54 +00:00
Guy Harris fb621af77a But we *do* have to include <zlib.h> here.
svn path=/trunk/; revision=51898
2013-09-09 21:12:49 +00:00
Guy Harris 0f849713dc Another "this depends on a ui_XXX.h" required to force the ui_XXX.h to
be built.

svn path=/trunk/; revision=51897
2013-09-09 21:09:03 +00:00
Chris Maynard c3fe87f04b With the change from r51895, revert r51894.
svn path=/trunk/; revision=51896
2013-09-09 21:09:00 +00:00
Pascal Quantin e5947cfa45 Cleanup follow.h a bit:
- no need to include zlib.h
- sgetline() function is not used outside of follow.c

svn path=/trunk/; revision=51895
2013-09-09 21:04:41 +00:00
Chris Maynard 85cb27ba2e Add $(ZLIB_CFLAGS) to the GENERATED_CFLAGS list to fix compile error.
svn path=/trunk/; revision=51894
2013-09-09 21:02:07 +00:00
Jörg Mayer 18a8525a54 While the previous fix to this file added the ; at the end,
it shoud have added _;

Was the original commit compile tested before committing?

svn path=/trunk/; revision=51892
2013-09-09 20:37:50 +00:00
Jörg Mayer 0a20370169 Make follow_stream_dialog.h compile.
Question: Should all this stuff really be included in the .h file
or in the .cpp file(s)?

svn path=/trunk/; revision=51891
2013-09-09 20:33:09 +00:00
Jörg Mayer 1d095d1b56 Add a missing ;
svn path=/trunk/; revision=51890
2013-09-09 20:25:59 +00:00
Jörg Mayer f93f3e241e No need to include gtk/gtk.h
svn path=/trunk/; revision=51889
2013-09-09 20:25:26 +00:00
Alexis La Goutte 80f9326b2f From Thomas ERSFELD (GSoC13)
Add TCP/UDP/SSL Follow feature to QtShark

Known issue :
* Duplicate code with GTK (function need follow_info_t struct but in GTK there is some GWidget variable in struct)
* Sometimes TCP Follow fail...

svn path=/trunk/; revision=51883
2013-09-09 19:30:30 +00:00
Alexis La Goutte 41174fa490 if display_filter is NULL, qtshark crash...
svn path=/trunk/; revision=51882
2013-09-09 19:30:19 +00:00
Alexis La Goutte fef81954ab add qtshark /path/mycap.pcapng support (from GTK code...)
svn path=/trunk/; revision=51881
2013-09-09 19:30:10 +00:00
Alexis La Goutte 37260a4e09 Use the same variable name than GTK (cf_name)
svn path=/trunk/; revision=51880
2013-09-09 19:30:02 +00:00
Jörg Mayer a34dd7e13f The previous commit contained some WIP: Check which files
still generate warnings. Finish that.
Only qcustomplot.cpp does. Move the rest to clean.


svn path=/trunk/; revision=51878
2013-09-09 19:23:17 +00:00
Jörg Mayer 8e5006a03f Commit 51871 did not update CMakeLists.txt
svn path=/trunk/; revision=51877
2013-09-09 19:16:40 +00:00
Alexis La Goutte f99f7bf17e From Dean Lee via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8597 Qtshark: Chinese Simp translation
From me :
Add to the (new) Qtshark Language selector

svn path=/trunk/; revision=51871
2013-09-09 17:49:15 +00:00
Alexis La Goutte fe4407ebc7 Add Preference to change Language (in QtShark)
Need restart application to change language

svn path=/trunk/; revision=51869
2013-09-09 16:20:45 +00:00
Gerald Combs 829c1ed25e Add the TCP window scaling graph. Add zoom selections.
Rename some methods. Add the ability to toggle time and sequence number
origins. Add more keyboard shortcuts. Comment out abs_secs abs_usecs in
the segment struct since it looks like we aren't using them. Make sure
we stay in the same TCP stream.

svn path=/trunk/; revision=51856
2013-09-09 01:40:06 +00:00
Evan Huus 720935ca04 Fix "seq_base could be used unitialized" warning. We should probably enable
-Werror for the qt code...

svn path=/trunk/; revision=51839
2013-09-08 15:05:08 +00:00
Gerald Combs abdac5bfac Add the TCP RTT graph.
Show the time values in ms instead of s. Add a button and keyboard
shortcut to switch the connection direction. Move more code to
tap-tcp-stream.c. Update our axis labels.

svn path=/trunk/; revision=51832
2013-09-08 01:25:27 +00:00
Evan Huus a1d88c4620 Fix a few more places that didn't have a semicolon after the address-macro use.
svn path=/trunk/; revision=51820
2013-09-07 13:22:58 +00:00
Gerald Combs 2dca89e7a3 Only add data points to the throughput graph if our time window has
advanced. Add a reset button.

svn path=/trunk/; revision=51811
2013-09-07 03:51:27 +00:00
Gerald Combs f9a9753d01 Fix PacketList::goToPacket work correctly. Minor screen graph
improvements.

svn path=/trunk/; revision=51808
2013-09-07 00:33:41 +00:00
Gerald Combs 297d1994f8 Switch from a 20 segment moving average to a 1 second MA. Add a #define
to allow switching back to the old behavior.

Note that goToPacket can jump to the wrong packet if we have a display
filter applied.

svn path=/trunk/; revision=51801
2013-09-06 19:07:57 +00:00
Gerald Combs df6f3412dd Adjust titles and labels.
svn path=/trunk/; revision=51797
2013-09-06 02:00:14 +00:00
Gerald Combs 29e03fe9d6 Make graph movement pixel-based to match the GTK+ version.
svn path=/trunk/; revision=51796
2013-09-06 00:48:21 +00:00
Gerald Combs 6003d3b2f6 Throughput graph usability updates.
Make the stream graph dialog modeless and let the user open multiple
instances. The dangling dialog behaves similar to the GTK+ version. Add
a setDissectedCaptureFile signal to MainWindow (currently unused).
Properly transform yAxis2 and simplify resetAxes while we're at it.
Other bug fixes.

svn path=/trunk/; revision=51795
2013-09-06 00:41:07 +00:00
Gerald Combs 03fd39d7f0 Throughput graph updates.
GTK+: Fix what appears to be an off-by-one error in the MA period (21
segments instead of 20). Throw away our initial segment length instead
of subtracting it from the moving sum, which skews the sum.

Qt: Add the througput graph. Use bits/s for the throughput y axis. Let
the user switch between graph types. The dialog hangs when doing this. I
haven't been able to track down the cause. Remove some unused code.

Both: Tell the user that we're using a 20 segment moving average. Move
more routines to tap-tcp-stream.[ch].

svn path=/trunk/; revision=51759
2013-09-04 23:15:59 +00:00
Gerald Combs dc002f2524 Add a note about making the behavior more native on Windows and OS X.
svn path=/trunk/; revision=51725
2013-09-03 16:30:38 +00:00
Gerald Combs 3331d6d4e9 Use more consistent naming.
svn path=/trunk/; revision=51724
2013-09-03 16:14:38 +00:00
Evan Huus 259ebc5269 Respect the other layout preference in qtshark: which pane goes in which spot.
svn path=/trunk/; revision=51723
2013-09-03 16:06:20 +00:00
Jörg Mayer 7cd3ff3a8e Fix for
QWidget::setWindowModified: The window title does not contain a '[*]' placeholder

a) Add [*] to the window title.
b) Also set the window title before calling setWindowModified

Not really understanding what I'm doing here, just following the hints
given in http://qt-project.org/forums/viewthread/2108

Original logmessages when closing Wireshark while running a capture.

17:23:39.652 Capture Msg  Capture stopped!
17:23:39.653 Main Dbg  Callback: capture update finished
QWidget::setWindowModified: The window title does not contain a '[*]' placeholder
FIX: packet list heading menu sensitivity
17:23:39.653  Dbg  FIX: capture_info_ui_destroy
17:23:39.653 Main Dbg  Callback: Closing
FIX: packet list heading menu sensitivity
17:23:39.655 Main Dbg  Callback: Closed


svn path=/trunk/; revision=51722
2013-09-03 15:35:32 +00:00
Evan Huus a795048300 Correctly update the pane layout whenever the preferences are changed, you no
longer need to restart for that to take effect. Hopefully I got all the slot
ordering right.

svn path=/trunk/; revision=51720
2013-09-03 13:29:09 +00:00
Evan Huus 78529b2038 Separate window creation from the laying out of the list/tree/byte panes. This
more-or-less restores the correct splash behaviour on startup.

svn path=/trunk/; revision=51719
2013-09-03 12:53:32 +00:00
Evan Huus 16cbf7d4cf Parent the list, tree and byte panes from the main UI rather than the
splitters they're actually layed out in. This should let us reorganize the
splitters at will (when the prefs change) without reconstructing the panes.

svn path=/trunk/; revision=51718
2013-09-03 12:21:14 +00:00
Alexis La Goutte 53c2e68794 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51682
2013-09-02 23:15:50 +00:00
Alexis La Goutte 68ceffe2ae Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51681
2013-09-02 23:15:40 +00:00
Evan Huus 785c1a5310 Respect the layout preference (just the horizontal/vertical splitting of the
panes, not yet which data goes in which pane).

You currently have to restart for the change to take effect. I also had to move
the preferences-reading (and thus the epan_init) call to before the main window
instantiation so that the preference was actually available for use. This means
that the progress-bar doesn't show up for very long any more, since most of the
work is already done by the time it appears.

I'm sure there is a way to delay just the layout setup until later, but I kept
getting slot errors I couldn't figure out...

svn path=/trunk/; revision=51647
2013-09-02 16:03:13 +00:00
Evan Huus ae176260e5 Add long-opts support to qtshark. Take -r or --read-file to open a capture file
immediately from the CLI. Get rid of the comment concerning multi-pass parsing
of the options, it only applied to the GTK version.

svn path=/trunk/; revision=51640
2013-09-02 14:15:23 +00:00
Evan Huus 72b18b1b8e Remove a bunch of commented code copied from the GTK version. We don't need it
(yet) and it is getting in the way while I try and add some argument parsing.
It's still in the GTK version if we want it.

svn path=/trunk/; revision=51639
2013-09-02 13:59:05 +00:00
Gerald Combs 74b205bc84 Set our connection capture filter in main() similar to the GTK+ version.
svn path=/trunk/; revision=51621
2013-08-31 16:53:24 +00:00
Gerald Combs 35e20fba4b Try to set a sensible capture filter at startup.
svn path=/trunk/; revision=51618
2013-08-31 16:16:36 +00:00