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

2065 Commits

Author SHA1 Message Date
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