aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-07-12make unit-test suite work out-of-treeEvan Huus1-5/+15
Change-Id: I638015a9b55712bb6843d6756c9c55915e142372 Reviewed-on: https://code.wireshark.org/review/2893 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-12dtls: fix faulty offsets and tvbuff referencesPeter Wu1-3/+3
This could lead to problems for fragmented DTLS packets. Change-Id: I602c7e181ea3799a4a2e7bcfed05bfbb129f7df4 Reviewed-on: https://code.wireshark.org/review/3017 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-12dissectors/llrp: Add support for Impinj's Hub extensionPetr Štetiar1-0/+70
Based on Impinj extension schema v1.4. Change-Id: Ica9493a4527ae800d6e5daaf2d86b8cfdf479ed1 Signed-off-by: Petr Štetiar <petr.stetiar@gaben.cz> Reviewed-on: https://code.wireshark.org/review/2981 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-11Add back -Qunused-arguments for Clang++.Gerald Combs1-1/+7
When used with ccache it can result in warnings as described at http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html. Change-Id: Ibca4fd262ec8d1f16a450b1698ead10f57d52b06 Reviewed-on: https://code.wireshark.org/review/3015 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-11Fix the x64 builds after the commit:b3b1f7c3aa2233a147294bad833b748d38fba84dGraham Bloice1-3/+3
From Change: 2803 Change-Id: Ic57fb0e3c1e0450561aebe48a873a3fdb2e8e105 Reviewed-on: https://code.wireshark.org/review/3014 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-11Add strlen casts.Gerald Combs1-2/+2
Change-Id: Icaf80f060c476dd7259c04c4cce4123025ef1dab Reviewed-on: https://code.wireshark.org/review/3012 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-11Add plumbing for stat commands ("-z ...").Gerald Combs9-67/+145
Trigger dialog creation by passing a method name to QMetaObject::invokeMethod. I'm not entirely sure this is sane but it seems to work OK. Move getopt processing further down in the main initialization sequence to more closely match GTK+ and allow for stat command registration. Change-Id: I5cd5375fa71dbadac69d528b2ba3bb13598dc3f6 Reviewed-on: https://code.wireshark.org/review/2964 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-11Remove $Id$Bill Meier1-1/+1
Change-Id: Iae71c6e65000471f251717a172c5f4b812ac1bd3 Reviewed-on: https://code.wireshark.org/review/3011 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-11GTP: allow empty Data Record Packet IEPascal Quantin1-0/+4
Bug: 10277 Change-Id: I4edf330fa1c44a52d985d70555c7756954fb9364 Reviewed-on: https://code.wireshark.org/review/3008 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-11logcat: improve (crash) robustness, improve namesPeter Wu1-102/+167
The logcat version detector would crash with ASAN enabled because it did not validate the payload length and hence a payload length of 0 would trigger out-of-bounds access. (This happened on non-logcat data.) This patch tries to get rid of all magic numbers by using a structure, improves the version detector to validate the payload length and prevents crashes due to missing nul-terminators in the input. Older Android kernels would create entries with __pad with random contents, so that cannot be used to determine version for v1. Instead, use heuristics on the priority, tag and maybe the msg field. Furthermore, Android is mostly (if not, always?) Little-Endian, so add conversions where necessary (just in case WS supports BE arches). "microseconds" has been renamed to "milliseconds" because that is what they are, actually. A duplicate logcat_log loop has been refactored such that one loop is sufficient, instead of separate buffers for each log part, a single one is now used. get_priority does not really need a pointer, just make it accept a character. The output has been validated against v1 and v2 logcat binary formats with __pad (hdr_size) equal to 0, and on attachment 9906. Change-Id: I46c8813e76fe705b293ffdee85b4c1bfff7d8362 Reviewed-on: https://code.wireshark.org/review/2803 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-07-11Restore some assignments of ti2 that were removed in the ↵Michael Mann1-15/+15
proto_tree_add_subtree[_format] conversion bug:10270 Change-Id: I40062065add1c6a08bdabc9dcbbe53afaafca035 Reviewed-on: https://code.wireshark.org/review/2997 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11Try to fix the build.AndersBroman2-6/+6
Change-Id: I06e813db6af41d9fa4effcf2b23cf91d72c8c0ec Reviewed-on: https://code.wireshark.org/review/2998 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11Update to fix for Bug 6302.Anish Bhatt1-11/+2
There is no need to check block constraints as min length already guarantees this, this also fixes false positives for missing TOS metric blocks Change-Id: Icbe3067d2506fad1c7dbcb175d932a5f242fa5cd Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2995 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11ssl: move CertificateRequest to ssl-utilsPeter Wu4-413/+211
Except for field/expert_info names, a redundant subtree assignment, a different !tree check, a type confusion in DTLS (proto_tree *ti), a check against a different DTLS/TLS version and a (void) retval cast, the functions are exactly the same. Extract them to ssl-utils. Change-Id: I2ca7089fe2cd23212ef78656506cb53768f55927 Reviewed-on: https://code.wireshark.org/review/2986 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11ssl: move Certificate handshake dissection to ssl-utilsPeter Wu4-196/+100
There are no dissection differences between DTLS and SSL, so move to ssl-utils. While at it, skip dissection when the tree is NULL, remove the plural from certificates length (the length is always larger than ome), fix type of "ti" for dtls, get rid of "failsafe" subtree assignment in ssl, get rid of tvb_ensure_bytes_exist in ssl. Unrelated changes: fix param (tvb vs sub_tvb) for DTLS KeyExchange handshake messages. Change-Id: Iecaa45a7a601e55a52aa16180cf219a122fbe95a Reviewed-on: https://code.wireshark.org/review/2985 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11ssl: add missing valid handshake typesPeter Wu4-122/+99
The DTLS dissector duplicated a handshake types check, this has been eliminated. Convert HandshakeType and ContentType to enums to get the benefit of compiler-checked switch cases. Move these checks to ssl-utils. Two default cases could never be reached since the dissector returns immediately on an invalid ContentType. Also fixed misleading debugging messages. Change-Id: I07a2062564e073004dcc0401cd82538e5659fa0c Reviewed-on: https://code.wireshark.org/review/2978 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11GTK Remote CapturingIrene Ruengeler11-314/+220
Move the GTK files necessary for managing the recnet remote host from capture_dlg.c to recent.c in order to use them in QT, too. Change-Id: I3f3fd31ce928162de08c6db7309ef2a9b1e97760 Reviewed-on: https://code.wireshark.org/review/2955 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11Strip some trailing whitespace; Fix some indentation; Add editor-modelines ↵Bill Meier17-51/+90
as needed. Change-Id: I943153e28f468070d86535abad7be032e1386118 Reviewed-on: https://code.wireshark.org/review/2994 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-11As opposed to *loudly* silently?Guy Harris1-4/+4
Change-Id: I5c6843ac2c665a4c8c8822084377fee661405d34 Reviewed-on: https://code.wireshark.org/review/2992 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-11Change comments to reflect current reality.Guy Harris1-5/+13
Change-Id: If4e220457d2040eaa35dd5e55a0f43fc9da5e347 Reviewed-on: https://code.wireshark.org/review/2991 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-11Avoid sign-extending bytes before handing them to <ctype.h> macros.Guy Harris2-2/+2
Pointed out by the Visual Studio code analyzer. Change-Id: Idd429b4d0fb3db11ce171c3a5b38bdc55cc53c15 Reviewed-on: https://code.wireshark.org/review/2988 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-10Quick fix to handle IEPS token.AndersBroman1-4/+16
Fix deorecated APIs Change-Id: Iad1f970b553f1655109b36364a1d37676582f608 Reviewed-on: https://code.wireshark.org/review/2984 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-10Fix Uninitialized argument value found by Clang AnalyzerAlexis La Goutte1-5/+5
Change-Id: I3cdb7734302b3e879def71dfa48c4654999ae9d2 Reviewed-on: https://code.wireshark.org/review/2983 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-10I don't see the point of inserting p_proto_data sorted useAndersBroman1-4/+3
g_slist_prepend(). While there fix deprecated API. Change-Id: Id5241348927d904d859530fac3f43f2b301a1acb Reviewed-on: https://code.wireshark.org/review/2982 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-10Fix a small typo in the FindChocolatey.cmake moduleGraham Bloice1-1/+1
Change-Id: Idefea86a9f65f59432db4bf32b9f702298409cdb Reviewed-on: https://code.wireshark.org/review/2980 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-10ssl,dtls: convert from tvb_lengthPeter Wu2-12/+12
Every occurrence of tvb_length* has been converted to tvb_reported_length* except some dtls lines. Change-Id: I0faac315cdf5d17c0af18be177aacd076ff86cff Reviewed-on: https://code.wireshark.org/review/2977 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-10Remove a useless line now that nghttp2 library has moved to /epanPascal Quantin1-2/+0
Change-Id: I41c876620e691f2e217fc9249d6abae01ea81b7f Reviewed-on: https://code.wireshark.org/review/2975 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-10convert to proto_tree_add_subtree[_format] for plugin dissectorsMichael Mann27-870/+471
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97 Reviewed-on: https://code.wireshark.org/review/2974 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-10Revert "See if we can get rid of the "lib" in front of "wsutil" on Windows."Guy Harris3-43/+43
This reverts commit c5a50df51f38e10e3a3618d9394364f60a1ca8af. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I6ead152fc308480d02266b0f3f0caaa873caf6d2 Reviewed-on: https://code.wireshark.org/review/2973 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-10Revert "More needed to get rid of "lib" in "libwsutil" on Windows."Guy Harris8-11/+11
This reverts commit 28719a4e4e01b478889dab9611fed517e506360e. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I32e400593e8a39f582cc702df34eea7f6e9e722a Reviewed-on: https://code.wireshark.org/review/2972 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-10Revert "A few more changes to remove "lib" from "libwsutil" on Windows."Guy Harris3-4/+4
This reverts commit 2fbedef5d13194c693ed6d0e773de249a6698278. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I88245c046b1cf1c76c73fc8e4bc13868e0df4e44 Reviewed-on: https://code.wireshark.org/review/2971 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09A few more changes to remove "lib" from "libwsutil" on Windows.Guy Harris3-4/+4
Change-Id: I4c694bb44ebced3d7ae66c16ec3a3ec58825d451 Reviewed-on: https://code.wireshark.org/review/2970 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09More needed to get rid of "lib" in "libwsutil" on Windows.Guy Harris8-11/+11
Change-Id: Iffc12ce67a8245e96eac3cf253641a15385001a9 Reviewed-on: https://code.wireshark.org/review/2969 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09See if we can get rid of the "lib" in front of "wsutil" on Windows.Guy Harris3-43/+43
"libXXX" is a UN*X convention; see whether we can do without it on Windows. Change-Id: I03a377ed5121a8dff7a53203b34e441abffcbb85 Reviewed-on: https://code.wireshark.org/review/2968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09h264: Remove unneeded errata checks.Britt McKinley1-48/+9
Some Microsoft errata were caused by bad decoding and were not actually problems. Remove the unneeded tests and expert information. Add PRID ranges values to Layer Presence bytes. Change-Id: I0b2b555bc448f0b4ee142b2920ae4e37d54ccab4 Reviewed-on: https://code.wireshark.org/review/2958 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-09Add back actionFileQuit.Gerald Combs1-0/+16
Change-Id: I76cfe038c02a869fb71dc74b7c55fd932e2ccbb2 Reviewed-on: https://code.wireshark.org/review/2967 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-09Fix a "recent items" crash.Gerald Combs3-23/+19
Use a QMutableListIterator instead of a foreach loop so that we can safely remove items from a list. While we're here, make sure that RecentFileStatus threads use a Qt::QueuedConnection when emitting signals across threads and try to isolate the filename string. Change-Id: I3fbb65a1727133f4557026decab5084a3faec2d4 Reviewed-on: https://code.wireshark.org/review/2966 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-09Print wIndex in decimal and hexSean O. Stalley1-1/+1
wIndex often contains different fields in it's upper & lower byte. Printing in hex makes these seperate fields easier to read. Change-Id: I69fb7e14b4f5b5a1ecd61bcae34f6d100f1a94b6 Reviewed-on: https://code.wireshark.org/review/2961 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-09Cmake : (Find XLST Proc) fix indent (use 4spaces)Alexis La Goutte1-47/+47
Change-Id: Ic8abdc9aaae899dcc5d870bc023c52dc7a2bbfe6 Reviewed-on: https://code.wireshark.org/review/2952 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-09CMake : Set html viewer exe path in HTML_VIEWER variable (and no set or ↵Alexis La Goutte1-1/+1
unset..), autotools only add exe name Change-Id: I552ef5d20fc80d341ce97da76b665e97df856d18 Reviewed-on: https://code.wireshark.org/review/2951 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-09CMake : fix name of HTML Viewer to display also the exe pathAlexis La Goutte1-1/+1
Change-Id: Id103ced59e0ae7e2cff272604f4cfe11d47fe957 Reviewed-on: https://code.wireshark.org/review/2950 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-09MAC LTE: interpret RAR TPC commandPascal Quantin1-2/+16
Change-Id: I4e44124d5634e570917730084619e138a6e534af Reviewed-on: https://code.wireshark.org/review/2963 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-09HDMI: remove useless includePascal Quantin1-1/+0
Change-Id: Ia575fc8f3e80666a13dbc54220aa3931a1c505f0 Reviewed-on: https://code.wireshark.org/review/2962 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-09Merge capture->interfaces and capture->optionsEvan Huus3-24/+1
Change-Id: I0a2976da97bd777abbf4701915551d9d481b0a13 Reviewed-on: https://code.wireshark.org/review/2785 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-09Moved nghttp2 to epanGraham Bloice26-190/+93
Cleaned up nghttp2 build Change-Id: I9f7adc12936155e0ffc01ec825b5aff95279f97d Reviewed-on: https://code.wireshark.org/review/2937 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-09Wireshark Qt: Fix recent (update the list of file when quit Wireshark)Alexis La Goutte2-25/+10
Change-Id: I2fac5178fca9675ffb70a942d094335323358d22 Reviewed-on: https://code.wireshark.org/review/2825 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-09convert to proto_tree_add_subtree[_format]Michael Mann41-1588/+850
Change-Id: I8d66b1bc7dbdfee3d4bf6fd3b3c21c6323b66f44 Reviewed-on: https://code.wireshark.org/review/2946 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-08LTE RRC: upgrade dissector to v11.8.0Pascal Quantin5-132/+590
Change-Id: I2bb0861029d0d30ae372b0b8085fbedeb4932217 Reviewed-on: https://code.wireshark.org/review/2949 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-08pre-commit: Add 'unset GREP_OPTIONS' (similar to Gerrit commit-msg)Bill Meier1-0/+2
msysgit grep is fairly old and doesn't recognize certain grep options, e.g., '--color=auto'. I imagine there may possibly be other grep option issues on various platforms. (I also note that the various git scripts in libexec/git-core clear out GREP_OPTIONS before calling grep). Change-Id: I67bc148a77cfc0167064e61e8c47a5f091704eac Reviewed-on: https://code.wireshark.org/review/2945 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-08Fix setting PT_IBQP typeYan Burman1-5/+1
Without this patch, pinfo->ptype is PT_UNKNOWN Change-Id: Ia15b5115f874d0c9ff69be11ed7ee3dac1fadbd5 Signed-off-by: Yan Burman <yanb@mellanox.com> Reviewed-on: https://code.wireshark.org/review/2941 Reviewed-by: Anders Broman <a.broman58@gmail.com>