aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-10-14Try to pptimize heuristics slightly.Anders Broman7-47/+62
svn path=/trunk/; revision=52603
2013-10-14Add dissection of NCM/MBIM data traffic based on data interface class ↵Pascal Quantin2-2/+30
protocol code svn path=/trunk/; revision=52602
2013-10-14Look for QtWidgets in the right directory.Gerald Combs1-6/+7
svn path=/trunk/; revision=52601
2013-10-14PacketList and ProtoTree need access to MainWindow at initializationGerald Combs3-6/+6
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-14do some range checks when reading vwr filesMartin Kaiser1-14/+14
don't assign the output of pntoh24() to a gint16 unfortunately, vwr detection does not work reliably and many pdf files are recognized as vwr - this commit should prevent wireshark from crashing when it tries to load the USB 2.0 spec as pdf ;-) svn path=/trunk/; revision=52599
2013-10-14Make pkgconfig work - sort of:Jörg Mayer2-9/+12
- fix a typo - Add the library dirs and not just the libraries. This would help if the paths that are now returned were actually correct. svn path=/trunk/; revision=52598
2013-10-14As reported by Didier Gautheron on -dev ↵Pascal Quantin1-1/+1
(http://www.wireshark.org/lists/wireshark-dev/201310/msg00159.html) : Since r49923, TCP flags are no more displayed in info column when tree is NULL svn path=/trunk/; revision=52597
2013-10-14TLS server key exchange misses sig and hash algorithm for TLS 1.2. Bug 9208 ↵Michael Mann1-6/+80
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9208). 1. Fix ECDH server key exchange for TLS 1.2 2. Fix RSA server key exchange for TLS 1.2 From Hauke Mehrtens svn path=/trunk/; revision=52596
2013-10-14DTLS server key exchange misses sig and hash algorithm for TLS 1.2. Bug ↵Michael Mann1-6/+80
9208 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9208) 1. Fix ECDH server key exchange for DTLS 1.2 2. Fix RSA server key exchange for DTLS 1.2 From Hauke Mehrtens svn path=/trunk/; revision=52595
2013-10-13DRX: start to show state prior to and after current PDU.Martin Mathieson1-71/+96
svn path=/trunk/; revision=52594
2013-10-13As requested by Zoltán Lajos Kis, split the openflow dissector int one file ↵Anders Broman4-422/+628
per protocol version. svn path=/trunk/; revision=52593
2013-10-13SMB2 SRT can be very inaccurate in the presence of retransmissions: ↵Cal Turney1-3/+12
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-13whitespace fixes; mostly: remove trailing blanksBill Meier195-2063/+2063
svn path=/trunk/; revision=52591
2013-10-13Minor whitespace changesBill Meier1-907/+907
svn path=/trunk/; revision=52590
2013-10-13Don't clobber PKG_CONFIG_PATH.Gerald Combs1-1/+10
svn path=/trunk/; revision=52589
2013-10-13Minor whitespace, formatting & etc changes.Bill Meier12-1733/+1695
svn path=/trunk/; revision=52588
2013-10-13When printing PDML, don't assume that all values with bitmasks are representedEvan Huus1-1/+23
as guint32 internally - they may be signed and/or 64-bit. svn path=/trunk/; revision=52587
2013-10-13[Automatic manuf, services and enterprise-numbers update for 2013-10-13]Gerald Combs2-2/+32
svn path=/trunk/; revision=52584
2013-10-13Subsume README.binarytrees into wmem doxygen. The README was out of dateEvan Huus7-263/+60
anyways, since Michael made key operations non-destructive in r44380. svn path=/trunk/; revision=52583
2013-10-13openSAFETY: Dissection for second crc as well as plausability check. Bug ↵Michael Mann1-24/+108
9261 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9261). From Roland Knall svn path=/trunk/; revision=52582
2013-10-13Set CMake to use Python when building the tap register files.Graham Bloice1-8/+8
svn path=/trunk/; revision=52581
2013-10-13Add CMake properties to targets so that they are logically organised when ↵Graham Bloice26-1/+56
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-13Fix dissection of Home Provider CID and fix a typo errorPascal Quantin1-1/+2
svn path=/trunk/; revision=52579
2013-10-13So a while back Jeff added some code to check that the offset+length passed toEvan Huus3-44/+28
proto_tree_add_item was valid *before* we short-circuited based on a NULL tree. This was good in that it removed a common source of really-long-loop bugs. It was less good in that it cost us about 8% in speed when doing a tree-less dissection, but we decided the tradeoff was worth it. After Anders' recent mail to -dev about performance, I started thinking about how to optimize this. It occurred to me that the vast majority of the logic involved in the check was dealing with the length value - fetching the actual length if it was a counted string, calculating the length if it was -1, adding the length to the offset in a way that was free from overflows, etc. All of this is (theoretically) unnecessary - simply checking the offset without worrying about the length will still catch the very-long-loops, since it is the offset that increases in each iteration, not the length. All that to justify: - implement tvb_ensure_offset_exists which throws an exception if the offset is not within the tvb - use it instead of all the complicated other logic in the pre-short-circuit step of proto_tree_add_item and friends This gives us back about 3/4 of the performance we lost in the original patch. We're still ~2% slower than without any check, but this is the best I can think of right now. svn path=/trunk/; revision=52578
2013-10-13Order our conditionals to take advantage of the fact that we know tvb->length <=Evan Huus1-22/+14
tvb->reported_length. Small performance win on the hot path, and a bit easier to read. svn path=/trunk/; revision=52577
2013-10-12Update the User Guide for the upcoming 1.11.0 releasePascal Quantin3-3/+3
svn path=/trunk/; revision=52576
2013-10-12Tweak/simplify some tvbuff length check functions slightly. In my benchmarks ofEvan Huus1-24/+12
dissecting without tree, they are costly because they now happen for every proto_tree_add_item call even if tree is NULL. svn path=/trunk/; revision=52575
2013-10-12Remove some things that I added while not understanding the realJörg Mayer3-9/+10
problem/solution. "Long" since solved by copying the solution from Makefile.nmake. Small update to the status of cmake builds on windows svn path=/trunk/; revision=52574
2013-10-12Redo r52569 in a way that doesn't break the GUI. Add a mem_pool member toEvan Huus2-102/+55
tree_data and reference it directly when allocating/freeing tree items. This lets us keep multiple around when we need them, and still lets us use wmem_free_all for a major speedup. It also, coincidentally, lets us get rid of the annoying fi_tmp hack that was needed before, since that element gets swept up in the free_all with everything else. Keep one pool cached to avoid creating/destroying a pool for each packet, another minor performance win. The various changes in approach seem to balance out pretty much exactly, this still gives ~11% over pre-52569. svn path=/trunk/; revision=52573
2013-10-12Revert r52569, it breaks the GUI since that sometimes has multiple trees activeEvan Huus1-3/+17
at once. svn path=/trunk/; revision=52572
2013-10-12If the offset is out of bounds, have tvb_length_remaining() and ↵Chris Maynard2-7/+6
tvb_reported_length_remaining() return 0 instead of -1. This should provide a better long-term fix for bugs/problems such as seen in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263. In the long-run, if we like this behavior, we can change the return value to a guint as well. Let's let it simmer for awhile first ... svn path=/trunk/; revision=52571
2013-10-12Don't assume that tvb_length_remaining() or tvb_reported_length_remaining() ↵Chris Maynard1-8/+8
always return a value >= 0. Part of fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263 #BACKPORT(1.10,1.8) svn path=/trunk/; revision=52570
2013-10-12Use wmem_free_all on the tree pool rather than freeing each node, label andEvan Huus1-17/+3
field_info separately. We still have to walk the tree in order to free certain fvalues, but that's not a big deal. Another ~11% speed-up running "tshark -nVr" on a large capture. svn path=/trunk/; revision=52569
2013-10-12Use a wmem block allocator to allocate field_infos, proto_nodes and item_labels.Evan Huus1-7/+13
Even without making use of free_all (which should be possible) this still results in ~8% speedup running "tshark -nVr" on a large file in my tests. svn path=/trunk/; revision=52568
2013-10-12Update User Guide for 1.11 preparationPascal Quantin1-9/+9
svn path=/trunk/; revision=52567
2013-10-12From Todd Newton via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9262 :Pascal Quantin1-1/+1
Fix dissection of PTP Management messages svn path=/trunk/; revision=52566
2013-10-12We can't use proto_tree_add_uint_* for FT_TIME fields, use proto_tree_add_time_*Evan Huus1-4/+8
instead. Fixes another one of the issues that shows up in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263 svn path=/trunk/; revision=52565
2013-10-12Based on help and suggestions from Johannes Berg, fix Radiotap Header decode theEvan Huus2-8/+5
right way. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9256 without reintroducing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9212 svn path=/trunk/; revision=52564
2013-10-12From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9229Evan Huus2-0/+81
Add a new strutil function format_text_chr that replaces unprintable characters with a single passed-in char (eg a '.' or a '-') instead of a C-style escape. This is useful for displaying binary data that frequently but not always contains text; otherwise the number of C escape codes makes it unreadable. svn path=/trunk/; revision=52563
2013-10-12Have pixbuf_to_widget() use a guint8 * to matchGerald Combs2-2/+2
gdk_pixbuf_new_from_inline(). svn path=/trunk/; revision=52562
2013-10-12Another Solaris Studio C++ fix.Gerald Combs1-5/+3
svn path=/trunk/; revision=52561
2013-10-12Free the actual struct, not the typedef thereof, because the typedef is actuallyEvan Huus1-1/+1
a typedef of a *pointer* to the struct, not the struct itself, which are different sizes. This doesn't show up under valgrind because the length isn't checked in that case, everything gets subsumed in valgrind's malloc/free hooks. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9264 svn path=/trunk/; revision=52560
2013-10-12Solaris Studio C++ won't let us pass the address of main() toGerald Combs2-2/+2
init_progfile_dir(). Try using QCoreApplication::applicationFilePath() instead. svn path=/trunk/; revision=52559
2013-10-12Update to the latest Windows library tags. Add an "install_qt" target.Gerald Combs3-3/+6
svn path=/trunk/; revision=52558
2013-10-12QT_DIR → QT5_BASE_DIR. This matches the CMake environment.Gerald Combs2-21/+21
svn path=/trunk/; revision=52557
2013-10-11Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake.Gerald Combs2-0/+16
svn path=/trunk/; revision=52556
2013-10-11With Gerald's patch we should no longer require GTK includes for QT-Only buildsJörg Mayer1-10/+0
(untested). svn path=/trunk/; revision=52555
2013-10-11One more HAVE_LIBPCAP.Gerald Combs1-0/+2
svn path=/trunk/; revision=52554
2013-10-11cf_start_tail() is (now) just a wrapper around cf_open(). Get rid of it and ↵Jeff Morriss3-22/+1
just call cf_open(). svn path=/trunk/; revision=52553
2013-10-11Try to fix Qt compilation when libpcap is disabled.Gerald Combs11-16/+76
svn path=/trunk/; revision=52552