aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo638-3408/+3408
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Fixup: tvb_get_string(z) -> tvb_get_string(z)_encDario Lombardo171-567/+567
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe Reviewed-on: https://code.wireshark.org/review/2376 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Don't compile anything with -msse4.2 unless the compiler supports it.Guy Harris2-1/+3
This includes ws_mempbrk_sse42.c; if the compiler doesn't support -msse4.2, HAS_SSE4_2 isn't defined, so all the stuff in ws_mempbrk_sse42.c that uses SSE 4.2 will be #ifdeffed out. Not all compilers with which we're built will support -msse4.2; in particular, the ones that aren't compiling for x86 won't.... Change-Id: I69566ca06f602104b40c78b3b06fcb7dfeb054b2 Reviewed-on: https://code.wireshark.org/review/2373 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Don't put c-comments into cmake files. Won't work at midnight either.Joerg Mayer1-2/+2
Change-Id: I80efce78a044f477af56f82cc9d8e85c8544ffbc Reviewed-on: https://code.wireshark.org/review/2372 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18Fix compilation warningYan Burman1-2/+2
Change-Id: Ia7922415d8b22ba0c5a04ad6940c7e10bc205d57 Reviewed-on: https://code.wireshark.org/review/2371 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18Fix building uiqt on Windows with the cmake build system:Joerg Mayer2-5/+5
Protecting HAVE_PCAP_CREATE was not enough for the moc run in qt, maybe it doesn't have _WIN32 set? Don't even try to detect this function on WIN32 for now. Change-Id: I0d8a8b5b110cec164f86fe11f26a7add558eee1b Reviewed-on: https://code.wireshark.org/review/2370 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18PDCP LTE: do not try to decipher PDCP control messages (like ROHC feedback)Pascal Quantin1-3/+6
Change-Id: I4a1596fd45bbc78ed8e90accf69ac048e7053161 Reviewed-on: https://code.wireshark.org/review/2366 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Replace glib memory with wmem memoryEvan Huus1-66/+25
Fixes potential memory leaks. Bug:8102 Change-Id: I88f9a74e3f782232d2da0bc7d83727dc3253f376 Reviewed-on: https://code.wireshark.org/review/2364 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Convert the obvious emem to wmem in lua code.Evan Huus4-8/+15
Bug:9927 Change-Id: Ibf0dd45d3b54e489b70a4fde193b825ec703379e Reviewed-on: https://code.wireshark.org/review/2349 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18TCP: do desegmentation sanity checks for all sub dissectors typesPascal Quantin1-23/+14
Change-Id: I02fe9827d8c1618f7dc6696e7d8667681a48d4a9 Reviewed-on: https://code.wireshark.org/review/2355 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Optimize tvbparse character set checking.Jakub Zawadzki1-61/+29
This patch makes tvbparse_[not_]chars() to generate array of characters which is accepted, later this array is checked in cond_chars_common(). This results in nice speedup of XML dissector (~33% for my file). Change-Id: I62a5585f8bccaaea1a0c49fc70c7552531493442 Reviewed-on: https://code.wireshark.org/review/2356 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18If we don't check for something, don't print a result.Guy Harris1-2/+0
This caues a bunch of bogus "no"s to be printed when testing for various compiler options when the compiler isn't GCC-like enough to accept GCC-style -W, -f, and -m flags. Change-Id: I16cf45729c61d166644cbddccfbaeb9b7770b045 Reviewed-on: https://code.wireshark.org/review/2365 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Fix x86 buildbots, revert sse4.2 AM_CONDITIONAL logicJakub Zawadzki1-1/+1
Change-Id: I0b594089753980b58f702e86293028c8dc7e4e54 Reviewed-on: https://code.wireshark.org/review/2363 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Don't do the check for clang/clang++.Guy Harris2-43/+0
Adding -Qunused-arguments to CXXFLAGS causes the checks for -f and -m flags not to fail with clang++, causing the configure script to warn about -f flags supported by clang but not clang++ indicating that the compilers are a mismatched pair. The checks we do for flags should eliminate "unused" -f/-m flags, suppressing the warnings that way. Change-Id: I749d6f499a3d34300518cc0ba539f355377359af Reviewed-on: https://code.wireshark.org/review/2362 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Add -Werror when testing -m compiler flags.Guy Harris1-2/+18
As with -f flags, some compilers need -Werror to force the compiler to fail when passed an unknown -m flag. Also, if it's not a -W or -f or -m flag, don't forget to add it to CFLAGS and/or CXXFLAGS. And propagate a comment to the C++ flag testing. Change-Id: I53e0e59b34b10b9477c60ddd4f2e047b3b8be77f Reviewed-on: https://code.wireshark.org/review/2361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Update debian/symbols for the changed library ABIsBalint Reczey2-13/+8
Change-Id: I942a92569472e3cecfaee004778561986aee3e69 Reviewed-on: https://code.wireshark.org/review/2357 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Get rid of the Python stuff, as we've gotten rid of Python plugin support.Guy Harris1-10/+2
Also, update a comment to more accurately describe what a loop is doing, and get rid of an unused variable. Change-Id: I948fc4ad758152b483450bf74f653087c892ad3a Reviewed-on: https://code.wireshark.org/review/2360 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Set the conditional SSE42_SUPPORTED in all circumstances.Guy Harris1-3/+4
This might fix the Solaris/SPARC build error configure: error: conditional "SSE42_SUPPORTED" was never defined. Usually this means the macro was only invoked conditionally. (not all the world's a VAX^Wx86). Change-Id: Ib189ce70b203875188cee3266b8652c02ca34237 Reviewed-on: https://code.wireshark.org/review/2358 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-17Rewrite check for ws_mempbrk_sse42.c compilationJakub Zawadzki2-9/+30
- check only for -msse4.2 - check if there's nmmintrin.h header - don't check if current CPU support -msse4.2 (fix cross compilation) Change-Id: Iba8d291fdf5602937ab540a69b7608a81427ad25 Reviewed-on: https://code.wireshark.org/review/2189 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17check for correct ftypeMartin Kaiser1-2/+4
Change-Id: I2274b97c74a845e6514e8acff136e55f721f11a8 Reviewed-on: https://code.wireshark.org/review/2354 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-17make dissect_ipmi_cmd() staticMartin Kaiser1-1/+2
Change-Id: Ie494a52fa73f7b91bc65da1bc36516f799ef4967 Reviewed-on: https://code.wireshark.org/review/2353 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-17Make sure we hide columns for live captures as well.Gerald Combs2-18/+11
Remove some dependencies on having an open capture file. Change-Id: Iad5d03e0a45ed31c83781861ef1ed7fdeb92e4a5 Reviewed-on: https://code.wireshark.org/review/2352 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-17Update a comment about how to better identify retransmissionsJoerg Mayer1-0/+2
Change-Id: Iec83f7e713a3077f1f4569aa86a55a69684b3097 Reviewed-on: https://code.wireshark.org/review/2351 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17When building an OS X package for GTK+, put the libraries in lib.Guy Harris1-5/+10
This reverts to the way we did it prior to the switch to Qt; with GTK+, Contents/MacOS/Wireshark is just a launcher, and the Wireshark binary is in Contents/Resources/bin/wireshark-bin, and the appropriate rpath entry would be @executable_path/../lib - @executable_path/../Frameworks, which works for the Qt version, in which Contents/MacOS/Wireshark is the actual executable, doesn't work for the GTK+ version. This should fix bug 10185. Change-Id: I4e50a4ead8f29a742c97a9001c821aabe1fa5e65 Reviewed-on: https://code.wireshark.org/review/2347 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-17Set the rlc len field before we try to use it in an expert info.Evan Huus1-1/+1
Bug:9795 Change-Id: I740a9fe36278995cf6e590206f600c037789f0eb Reviewed-on: https://code.wireshark.org/review/2344 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17Initialize smb ioctl_function struct memberEvan Huus1-1/+2
Bug:10020 Change-Id: I415a29dd36697887cb06485d6ed3a2b799a93464 Reviewed-on: https://code.wireshark.org/review/2342 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17Get QtShark building on Win7 with Qt 5.3.0 using Qt Creator.Tim Furlong6-6/+6
Several header file references in .ui files needed to be changed to not be global, and the path to stats_tree_dialog.ui needed a "../qt" path prepended to be found from the build...-Release directory. Change-Id: I51c0bb15eed706f483085020ce2b3cea3c1cdc95 Reviewed-on: https://code.wireshark.org/review/2281 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-06-17Initialize rq_hdr.sessionEvan Huus1-0/+2
Bug:10168 Change-Id: Ida4d82d102421152785ce680aa47bcb5cf8692f6 Reviewed-on: https://code.wireshark.org/review/2334 Reviewed-by: Dmitry Bazhenov <dima_b@pigeonpoint.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17Simplify obtaining the absolute path of the build dirJoerg Mayer1-2/+2
Change-Id: If0fabce21d7d12435f4f78768f7193564eeb2bb8 Reviewed-on: https://code.wireshark.org/review/2339 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17ip version and header-length are not full byte values. Show theJoerg Mayer1-5/+4
bit decoding for these values. Change-Id: I7ab6c4badf5b66d6f434a47523e2b35730ecb65d Reviewed-on: https://code.wireshark.org/review/2338 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17fix underflow in BER constrained bitstringsEvan Huus1-1/+1
this can happen and cause invalid memory accesses with incorrectly-large padding values Bug:10187 Change-Id: Ib9b2a2fa10766efb4d95d588f57354a56373c626 Reviewed-on: https://code.wireshark.org/review/2325 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17lua_pushstring takes a copy of its argumentEvan Huus1-2/+4
free the value we pass it, fixing a memory leak Change-Id: I446cb85d82a0697c24035461ad03450855b68884 Reviewed-on: https://code.wireshark.org/review/2304 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17Create and register subtree identifiers for all opcua array typesHannes Mezger8-439/+1571
Currently for all arrays, the generic ett_opcua_array is used, instead we want to be more selective for storing the expanded state of subtrees. This commit adds subtree identifiers for all array types. Change-Id: Idcec51a200d1109cdb557d3366021d3b066b453d Reviewed-on: https://code.wireshark.org/review/2176 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Return number of bytes dissected in dissector:callStig Bjørlykke1-2/+4
This does not work for old-style dissectors as they always return the number of bytes in incoming buffer and not the number of bytes dissected. This is noted in the documentation. Change-Id: I5b236a73952cac3efc830e40276283bed9af1f87 Reviewed-on: https://code.wireshark.org/review/2237 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Unify how opcua arrays are displayedHannes Mezger5-419/+450
- Display 'Array of <fieldname>' instead of 'Array of Simple Type' - Display array indexes for simple types - Display data type in simple type arrays Change-Id: Id2cc746898f97ce329c6afb9cc49f1907a9f18e4 Reviewed-on: https://code.wireshark.org/review/2161 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Add myself as author for the opcua dissector pluginHannes Mezger3-4/+9
Change-Id: If8349e778fd91426a6a4b6d6e98d3ab870d188d5 Reviewed-on: https://code.wireshark.org/review/2302 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Add dissect_nt_64bit_time_ex for retrieving the created proto_itemHannes Mezger2-5/+18
Using dissect_nt_64bit_time it is not possible to access the created proto_item afterwards, hence the new function. Change-Id: I39aca92536a53841045c30b601b6ec1a7d8bfb4e Reviewed-on: https://code.wireshark.org/review/2160 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17isakmp: add support for IKEv1 AES decryptionAlex Badea1-0/+15
Select an appropriate gcrypt cipher based on ISAKMP encryption ID and key length attribute. Fixes bug 10128. Bug:10128 Change-Id: Ie74fc51eb9bfe6d68340056d3ef2ef28c7677fb8 Signed-off-by: Alex Badea <abadea@ixiacom.com> Reviewed-on: https://code.wireshark.org/review/2296 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-17isakmp: allow IKEv1 decryption with non-PSK authenticationAlex Badea1-1/+0
There is a check that disables decryption for non-PSK authentication. It has been around ever since its introduction in commit acfe071e (svn r17229). As suggested in bug 7951, remove this check to allow decryption for e.g. certificates authentication. Bug: 7951 Change-Id: I5e98407d0f8dbabac2cdaf632cf0af403192872b Signed-off-by: Alex Badea <abadea@ixiacom.com> Reviewed-on: https://code.wireshark.org/review/2297 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17It's so simple: If we require a package but provide alternative methodsJoerg Mayer2-15/+10
of finding the package don't allow the first method to fail terminally. Todo: Fix this in all other places as well. Change-Id: I5a343fac33f6a5d6e50ff353d739459b2e36711a Reviewed-on: https://code.wireshark.org/review/2300 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17Add support for WRITE_LONG16 & REPORT_REFERRALS to scsi dissectorAnish Bhatt3-31/+136
Picking up leftover work on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8843 Change-Id: Ie3df55ae3309cf68f64b2aa184fb2904d1200cb5 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2239 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Get the Windows doc builds going again: define top_srcdir because it's used ↵Jeff Morriss1-0/+1
in Makefile.common. Change-Id: I4e8905b28bd6fb8c7bf3d38dbf3882c393732bcf Reviewed-on: https://code.wireshark.org/review/2291 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Remove detection of Python libraries: They are not used anymore.Joerg Mayer2-7/+0
Change-Id: If42bb16d5c6202889ff933af6c9d974866d2a950 Reviewed-on: https://code.wireshark.org/review/2290 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17Qt: fix loading of language translationAlexis La Goutte2-0/+21
But need always restart to apply change... Based on http://qt-project.org/wiki/How_to_create_a_multi_language_application Change-Id: I0f95afb68aa5b125e0707b0af1ce096dab9c29e4 Reviewed-on: https://code.wireshark.org/review/2286 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-17Fix copy/paste errors in value_string.Jakub Zawadzki5-5/+5
Also make repetition_coding_indications[] standard terminated. Change-Id: Ice20e1f27f5ab4d111f893608a230b83899efc9f Reviewed-on: https://code.wireshark.org/review/2288 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17Convert tcap dissector to wmemEvan Huus2-28/+28
As far as I can tell these calls were just missed in the first initial pass, they're not in a weird scope. Close review from somebody else please to verify that! Change-Id: Ic3188879124dcb8fdf42e79d200d4f244200aa7b Reviewed-on: https://code.wireshark.org/review/2266 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16Column visibility fixups.Gerald Combs2-5/+15
Move visibility to its own method and call it when we show ourselves and when we thaw. Change-Id: I936cd33e5ccabddb32061ea347a465ac12f1be87 Reviewed-on: https://code.wireshark.org/review/2289 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-16Add a FIXME referring to bug 4096Joerg Mayer1-1/+3
Change-Id: I4263d791e7bc7dc410d2735e94bc765aee2d84bc Reviewed-on: https://code.wireshark.org/review/2287 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16More Python-bindings removal.Jeff Morriss15-526/+0
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce Reviewed-on: https://code.wireshark.org/review/2283 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16More Python removal.Guy Harris1-5/+1
Fix a duplicate @HAVE_LUA@ while we're at it. Change-Id: I21acf388498a996701adea401551a65c9ba4f5f0 Reviewed-on: https://code.wireshark.org/review/2285 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 18:09:36 +0000