aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-07-30Add libgpg-error6-0 to the GCRYPT_ERROR_LIBRARY search list.Gerald Combs1-1/+1
(Does FIND_LIBRARY support wildcards?) Change-Id: I240e93070091e445446478b082ad284267c977a6 Reviewed-on: https://code.wireshark.org/review/3272 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Fix dist.Gerald Combs2-9/+13
Add ui/cli/tshark-tap.h and packaging/nsis/windeployqt-to-nsis.ps1. Change-Id: I00465aed3f33595ad50be0ba5d0ed0eae54e1137 Reviewed-on: https://code.wireshark.org/review/3268 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Install our Qt DLL directories recursively.Gerald Combs5-22/+68
Qwindows.dll at least needs to be in the "platforms" subdirectory. Use a PowerShell script to convert the output of windeployqt to its equivalent NSIS instructions. Give the Qt DLL manifest a .nsh extension. Make sure we uninstall known Qt DLL directories. DLLs now load correctly according to Dependency Walker. Install and uninstall our .qm files while we're here. Change-Id: I06ed279809e6fce0e008c5f278a56b1ae34c8f21 Reviewed-on: https://code.wireshark.org/review/3267 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Fix the build: add a few more G_GINT64_MODIFIER's when printing 64-bit numbers.Jeff Morriss1-1/+3
Also use %u instead of %d for these unsigned numbers. Change-Id: I3d1df3bdcc3c68193b49ba8daf1dc56171356290 Reviewed-on: https://code.wireshark.org/review/3266 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-30Remove empty variable SHARK_COMMON_CAPTURE_SRC. It's not presentJoerg Mayer1-8/+1
for the other build systems as well. Small whitespace fix. Change-Id: I071ee4ae0fa85306435d2d82d36265973181b71c Reviewed-on: https://code.wireshark.org/review/3263 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-30fix encodingmask of DiagnosticInfoHannes Mezger1-4/+16
In 2008, before the OpcUa specification was released, the EncodingMask was changed to include the Locale after the LocalizedText. This commit applies the changes necessary to display DiagnosticInfo correctly. Change-Id: Iad35ff0557eac62a259a63505ebce3e637095136 Reviewed-on: https://code.wireshark.org/review/3259 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-30Fix use of uninitialized fieldPeter Wu1-1/+2
ssl_print_string uses out->data_len to determine the length of the printed data, but this was not set. Use ssl_data_set for that and add an additional DISSECTOR_ASSERT just in case we change something here. Reported by Alexis La Goutte, found by Clang static analyzer. Change-Id: I630a9193ff1ece86a0a46924dd86591fedf5c595 Reviewed-on: https://code.wireshark.org/review/3261 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-30Apply refactored "conversation" (tap) data to TShark.Michael Mann21-502/+107
I intentionally left the fields displayed alone (so they don't exactly match Wireshark GUI), because as Guy points out in bug 6310, not sure its A Bug or A Feature. But at least all types of conversations allowed are in sync with Wireshark GUI. Bug:6310 Change-Id: I722837df510a39dadc1f9a07a99275509516698c Reviewed-on: https://code.wireshark.org/review/3212 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-30Fix cmake build for portaudio V18Peter Wu1-1/+17
Note that the cache file (CMakeCache.txt) must be cleared when the include or library paths change, otherwise the cached result of CHECK_FUNCTION_EXISTS will be re-used. Change-Id: Ia18ed4f1b6b162499aeae6e66f612a4945390c2a Reviewed-on: https://code.wireshark.org/review/3245 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-30Convert tvb_get_ptr buffer access macros to use much safer tvb access macros.Michael Mann4-379/+426
Added a few filterable fields in the process of trying to figure out the macros. Much more can be done to add many more filterable fields (and remove proto_tree_add_text calls hidden in the macros), but that'll be done some other time. bug:10281 Change-Id: I9788f176c0e721ff4f243d4ecb79d7d0114fffc0 Reviewed-on: https://code.wireshark.org/review/3262 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-30GED125: remove a wrong comment regarding the default TCP portPascal Quantin1-1/+1
Change-Id: I53aa2053c65280385e13da875979ed09b37fb725 Reviewed-on: https://code.wireshark.org/review/3258 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-30Fix up some white space.Jeff Morriss1-12/+12
Change-Id: Ie8f1006d6b3a27fe0c8187ce99051c09dea09b66 (cherry picked from commit a3a5c33dad8669e37502f2ce4d0687f7ff7e87a1) Reviewed-on: https://code.wireshark.org/review/3257 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-30The Visual C++ 2013 redistributable uses /quiet instead of /q.Gerald Combs1-5/+10
Change-Id: I130b1af814b843638498feaecacc7092bacd3b72 Reviewed-on: https://code.wireshark.org/review/3255 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Dont force qt-dll-manifest.txt.Gerald Combs1-1/+1
Change-Id: I06781f9b0b89561a96b00c27f938005ebf5b915f Reviewed-on: https://code.wireshark.org/review/3254 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-29Use windeployqt with NSIS.Gerald Combs2-18/+27
If we find windeployqt, use it to create a DLL manifest for NSIS. Fall back to the previous manual lists if we don't. This assumes that your copy of windeployqt works. New bug: The Windows installer is huge when using the official Digia DLLs (around 43 MB for the win 64 package). Change-Id: I1f662381b7a2c5474595b05177dbdfd3138c7e60 Reviewed-on: https://code.wireshark.org/review/3253 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-29don't add nonprinting \000 characters to tftp option stringsMartin Kaiser1-4/+8
Change-Id: I81e43fac5176fdd0805001636991efb7f588a3c0 Reviewed-on: https://code.wireshark.org/review/3252 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-29remove unnecessary return; statementMartin Kaiser1-2/+0
Change-Id: Icefbaf632e888e84bcb2cc20ae3a6c4744b82fae Reviewed-on: https://code.wireshark.org/review/3251 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-29(trivial) modify, indent a commentMartin Kaiser1-1/+1
Change-Id: I64bb64787c83ffe712ffd348cceb5449690dd6d0 Reviewed-on: https://code.wireshark.org/review/3247 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-29Fix Argument with 'nonnull' attribute passed null found by ClangAlexis La Goutte1-0/+5
Change-Id: I719d8adeb4bc6dbd1e34fe56f7cf68e4c6286dc9 Reviewed-on: https://code.wireshark.org/review/3246 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Ensure that QT5_BASE_DIR is known by QtShark.proPascal Quantin2-1/+2
Otherwise the call to winqtdeploy will fail if it is not already in the PATH Change-Id: I74db604a6fd45204bda8d6ac9d9c98c0c12598ec Reviewed-on: https://code.wireshark.org/review/3218 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-07-29Remove duplicated entry for AVP 258 Auth-Application-Id from HP.xmlAndersBroman2-8/+2
it was overiding the correct one from dictionary.xml Change-Id: Ic6073a550a15f56584e214eec8bd79057673c25c Reviewed-on: https://code.wireshark.org/review/3244 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-29Remove unused variableEvan Huus1-4/+2
Change-Id: I590d4c2d79ee44309cd512057c7eae6df15913e9 Reviewed-on: https://code.wireshark.org/review/3240 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Fix heap-use-after-free via setlocalePeter Wu7-7/+61
setlocale returns a statically-allocated memory which can be modified by subsequent calls of setlocale. This triggers a heap-use-after free in ASAN when the setlocale function is called again with the previous pointer. This was found when trying to use the "Show All Streams" option via the Telephony -> RTP menu. While at it, add some modelines Change-Id: Ide47e877ce828734fd8c5c1b064d9c505ba2b37a Reviewed-on: https://code.wireshark.org/review/3234 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Add a couple more dissector authors.Jeff Morriss1-0/+10
Change-Id: Ib606efbcaf38803d98d3e755386eab3c4d35fdf7 Reviewed-on: https://code.wireshark.org/review/3238 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Document some new features (and API changes) since 1.12.0.Jeff Morriss2-3/+47
Change-Id: I404f038a739ca41cb124a979fe6cf807a0b7e978 Reviewed-on: https://code.wireshark.org/review/3235 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29EPL: Fix for Write Multiple by indexLukas Emersberger1-14/+125
Write multiple by index now correctly resolves OD names. Change-Id: I4d2aad584a47e3682716b95bdda0bc49c3a29d96 Signed-off-by: Lukas Emersberger <lukas.emersberger@gmail.com> Reviewed-on: https://code.wireshark.org/review/3223 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Lukas Emersberger <lukas.emersberger@br-automation.co.at> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Bug 10302 - BGP attribute AIGP (draft-ietf-idr-aigp) not decoded - FixMatthieu Texier1-0/+56
Change-Id: Ib8b3c5666932777218e33b74cca33b791c883fc9 Reviewed-on: https://code.wireshark.org/review/3226 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Fix possible uninitialized session key in netlogin authEvan Huus1-4/+4
Bug:10312 Change-Id: Ia2be812e81b54d6df5a928312cca86ecd95aa6b2 Reviewed-on: https://code.wireshark.org/review/3236 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Bluetooth: Fix OBEX over L2CAP detectionMichal Labedzki5-5/+6
There are two cases: 1. btl2cap -> btrfcomm -> btobex 2. btl2cap -> btobex Case 2 is rare, so according to its name and to avoid confusion I based on it. Bug:10316 Change-Id: Ibeabeaf2f8376425460c56bad8fb980b460dd940 Reviewed-on: https://code.wireshark.org/review/3225 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-28add 恵 to the AUTHORS fileMartin Kaiser1-0/+4
Change-Id: Iebddc7be48d6e6aeb3a8620e0cb902fb4d6206b2 Reviewed-on: https://code.wireshark.org/review/3233 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-28From 竹下 恵 (Megumi Takeshita)Martin Kaiser2-192/+192
update the japanese translation for the Qt user interface Change-Id: Ib4a0f6fc1d58cd71310703950c0f1e646b1d74ad Reviewed-on: https://code.wireshark.org/review/3232 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-28(Trivial) config.nmake: fix a spelling error and add some punctuation.Bill Meier1-1/+1
Change-Id: I326dbae8fe1d3593de00c9e78a124c1221b7314b Reviewed-on: https://code.wireshark.org/review/3231 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-28Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM ↵Pascal Quantin3-24/+25
environment variable is not explicitly set Bug: 10317 Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723 Reviewed-on: https://code.wireshark.org/review/3203 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-28Use wmem for application IdsAndersBroman1-29/+33
Remove soft deprecated APIs Change-Id: Iecd2f552c1abb7bb2c6969073b3c245af22f4fcd Reviewed-on: https://code.wireshark.org/review/3230 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28config.nmake: Do some minor changes (mostly in comments).Bill Meier1-3/+6
- Update comment: /O2 enables /Gs which is "Control Stack Checking Calls" not "Buffer Security Check" - Remove explicit setting of /GS (Buffer Security Check) since it's set by default. (The explicit setting did not apply to the CFLAGS used to compile Wireshark files because the setting was in the wrong place, but, fortunately, /GS is on by default. - Add a comment about /GS being on by default. - Remove some trailing whitespace. Change-Id: I6cf631ee1ba0fb8556171861c7e5eb6d959c8f0c Reviewed-on: https://code.wireshark.org/review/3228 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28Sort diameter.applicationId fix a typo.AndersBroman2-1/+5
Change-Id: Id585371df929cdff17f98dddbebf063fa000ff56 Reviewed-on: https://code.wireshark.org/review/3229 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28Add a few mor application IdsAndersBroman1-10/+31
Change-Id: I98d9735e2b54818a23c9a6e4086692d76f0713d5 Reviewed-on: https://code.wireshark.org/review/3227 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28Download the right User Guide...Pascal Quantin1-1/+1
Change-Id: Icf1f9bd48f0624226c55a622b7b8f774d103e5ae Reviewed-on: https://code.wireshark.org/review/3224 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-28Fix MSVC2013 Lua package (previous one was linked against MSVC2012)Pascal Quantin1-2/+2
Change-Id: I632eea7250e7e60482f62d9ea62ac407fc6506d1 Reviewed-on: https://code.wireshark.org/review/3222 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-27Make value_string_ext const-correct.Kevin Cox8-46/+39
There is still some const-incorrect usage of them but those can be ironed out after this change has been made. Change-Id: Iba0631c804bdab34d7c0232b49967130e3370488 Reviewed-on: https://code.wireshark.org/review/3199 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-27Add PortableApps temporary files to .gitignorePascal Quantin1-0/+4
Change-Id: Ie76d2c5cc167a4d63f6c83b64cdf6d1ebb07afa9 Reviewed-on: https://code.wireshark.org/review/3221 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-27Don't fail if unmounting the CMake disk image fails.Guy Harris1-1/+1
I don't know why, but sometimes it fails - the most recent failure was due to it having already been unmounted! Maybe the CMake installer unmounts it some times but not others. Just drive on if it fails. Change-Id: I1b31356f08695b8d3b9e425f8475a422e1da0783 Reviewed-on: https://code.wireshark.org/review/3220 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-27Remove printing done for debugging/test purposes.Guy Harris1-2/+2
Change-Id: Id6cdb34890c0f1d6c9e64d290ce72ca68183220e Reviewed-on: https://code.wireshark.org/review/3219 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-27Fix the path to the "fix one .pc file" script.Guy Harris1-1/+1
Change-Id: I1c16fe2076794e0b55b45417d9019440b0658037 Reviewed-on: https://code.wireshark.org/review/3217 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-27Fix quoting.Guy Harris1-1/+1
Change-Id: I54cb94b5c00b748100be22b10336a906da3c35b2 Reviewed-on: https://code.wireshark.org/review/3216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-27Add some scripts to fix up Qt's OS X binary packages.Guy Harris3-0/+33
You have to run macosx-support-lib-patches/qt-fix-pc-files manually, telling it where Qt was installed, but so it goes.... Change-Id: I8668a1fc4254cc002aee068749edb3cf3bdb854f Reviewed-on: https://code.wireshark.org/review/3215 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-27Fix incorrect whitespace. Why this wasn't spotted during review?Joerg Mayer2-3/+3
Change-Id: I54be42e020e2febf2e15d5eb0e772153eae1ba32 Reviewed-on: https://code.wireshark.org/review/3213 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-27Added function dnp3_header_check() to check the validity of a DNP3Graham Bloice1-10/+40
packet as far as possible, called from both dissect_dnp3_tcp and dissect_dnp3_udp. Bug: 10287 Change-Id: Iaa988258b3614cb1b408dec41a987fbd61c9727c Reviewed-on: https://code.wireshark.org/review/3096 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-27Use a compatible Lua library when building with MSVC2013Pascal Quantin1-4/+8
Change-Id: If462dc45df9dbd418c4de2eb6bb9130a283d863c Reviewed-on: https://code.wireshark.org/review/3211 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-27[Automatic manuf, services and enterprise-numbers update for 2014-07-27]Gerald Combs3-17/+232
Change-Id: I07f7d2340c70fb3dbacf6d2792f5fab194212e22 Reviewed-on: https://code.wireshark.org/review/3208 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 13:07:48 +0000