Commit graph

53403 commits

Author SHA1 Message Date
Guy Harris
8dabe0027a We don't need -Qunused-arguments with Clang
check_c_compiler_flag now checks for the message Clang prints for -f and
-m flags it doesn't handle ("argument unused during compilation:
'-{flag}'"), so the checks for it now should fail properly during
testing, causing us not to use the flag in question.  This means we
don't need to suppress that warning, as we shouldn't be getting it.

Change-Id: Ieb9657f9e2cee2f357acd52725199d78d2dad80f
Reviewed-on: https://code.wireshark.org/review/2401
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:58:57 +00:00
Guy Harris
c6007e8d26 We don't need -Werror=unknown-warning-option with Clang.
check_c_compiler_flag checks for the message Clang prints for an unknown
warning option ("unknown warning option '-WXXX'"), and fails if it's
produced, so we don't need to force the compiler to fail by passing it
-Werror=unknown-warning-option.

(Yes, the CMake way of handling those annoying options is different from
the way we do that in autotools - autotools adds flags to force errors,
CMake checks for the warning messages - but that's OK.)

Change-Id: I5c2e5d6f4826eba7048736d5134d20417778276a
Reviewed-on: https://code.wireshark.org/review/2400
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:55:27 +00:00
Guy Harris
5e5e2019ee Another message from Clang for unknown -f and -m flags.
For -f and -m flags that don't apply to the target architecture(?),
Clang doesn't fail but does print a warning "argument unused during
compilation: '-{flag}'".  Catch that and treat it as a failure
indication, so we don't use that flag.

Change-Id: I65948ada41fa44fb62f9a2b8b320f137a5902b8f
Reviewed-on: https://code.wireshark.org/review/2399
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:46:09 +00:00
Evan Huus
fca7b3f4f8 Check for lua by grepping the output of tshark -v
Grepping config.h doesn't work for out-of-tree builds.

Change-Id: If3f551dffb04dd646f5adece57fac90dc48ff1c9
Reviewed-on: https://code.wireshark.org/review/2389
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 18:32:18 +00:00
Guy Harris
77e34736c5 Do C-Flags and CXX-Flags the same way.
It looks weird to have "-- " before C-Flags but not CXX-Flags.

Change-Id: I95f309b60a45cbd4477c8ed6187b198ab9bac9d8
Reviewed-on: https://code.wireshark.org/review/2398
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:31:20 +00:00
Evan Huus
08063d824b Build unit test binaries with Cmake
That was surprisingly easy.

Change-Id: Idda34580fd694cb0d253a121921f31d3731d3007
Reviewed-on: https://code.wireshark.org/review/2396
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 18:27:38 +00:00
Shoichi Sakane
009bebbf09 Fix copy-paste probem in COAP dissector
Bug:8070
Change-Id: I7a86a37f7de6b3e4e12fe1c47980a9a6604488d6
Reviewed-on: https://code.wireshark.org/review/2390
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:11:49 +00:00
Pascal Quantin
248a503a97 Update ASN.1 source files with the API changes done in g971ffd6
Change-Id: Iac4952f64622cd28941f582adf54ecf7843f8c28
Reviewed-on: https://code.wireshark.org/review/2395
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:05:57 +00:00
Pascal Quantin
e09d127a9a Update PIDL source files with the API changes done in g021e7af
Change-Id: I2917cbae077865f9ec171900810f85f54b349c2c
Reviewed-on: https://code.wireshark.org/review/2394
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:05:04 +00:00
Pascal Quantin
f99aaf8de3 PCLI: do not register UDP port 9000 by default as it is not allocated to this protocol by IANA
Change-Id: I5f692ddf5ae5ba7366b34830bd9e99efacd66037
Reviewed-on: https://code.wireshark.org/review/2393
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:04:25 +00:00
Pascal Quantin
cc37b50334 Get rid of obsolete references to nettle
Bug: 2089
Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83
Reviewed-on: https://code.wireshark.org/review/2388
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:03:43 +00:00
Joerg Mayer
c6324a0b1e Get rid of some ancient qualityreview comments...
Change-Id: If25bdd594b20b656c345dcfe62765379f5dd9c5e
Reviewed-on: https://code.wireshark.org/review/2392
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 17:47:18 +00:00
Guy Harris
54819e5699 ssl_parse_key_list() gets called from the UI, so don't use packet scope.
Instead, explicitly allocate and free the address string.

Using packet scope was causing test failures.

Change-Id: Ie18d2da44d2eec8a92a6a86b0ba883a5525f49cd
Reviewed-on: https://code.wireshark.org/review/2387
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 17:03:22 +00:00
Pascal Quantin
f2dd6c0a6d SABP: fix an error spotted by pre-commit hook
Change-Id: I733e2e72b52293b3c7c15f4e0c240f7e01f4b98c
Reviewed-on: https://code.wireshark.org/review/2386
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:58 +00:00
Pascal Quantin
e308e7c4de Update ASN.1 source files with the API changes done in g021e7af
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88
Reviewed-on: https://code.wireshark.org/review/2385
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:42 +00:00
Evan Huus
b5a462b087 Try to calculate the initial RTT of tcp conns
This (if it works well) will let us do much more accurate out-of-order
detection, which is currently otherwise hardcoded to 3ms. Ask Jörg for details.

Change-Id: Ie0662723946edeaea1e43958bf7f5158f09dde71
Reviewed-on: https://code.wireshark.org/review/2367
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 15:07:08 +00:00
Martin Kaiser
cd56eb970f move dissection of usbpcap isochronous packets to a separate function
Change-Id: Id292fd1b0fbff3a043e64296a88c78c1a5ac00d7
Reviewed-on: https://code.wireshark.org/review/2369
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-18 15:00:06 +00:00
Dario Lombardo
7fea55a054 Fixup: ep_address_to_str -> address_to_str
Change-Id: Id49ba07e32a71357b50b32de7cecfd80e412d508
Reviewed-on: https://code.wireshark.org/review/2379
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:22:02 +00:00
Dario Lombardo
021e7afc9f Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remaining
Change-Id: I0228f3b6b7067bc0ce51f9d359f99fd18feb2b66
Reviewed-on: https://code.wireshark.org/review/2378
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:20:32 +00:00
Dario Lombardo
246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Dario Lombardo
971ffd683e Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe
Reviewed-on: https://code.wireshark.org/review/2376
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:13:58 +00:00
Guy Harris
421d817d70 Don't compile anything with -msse4.2 unless the compiler supports it.
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-18 09:50:43 +00:00
Joerg Mayer
7939f6888b Don't put c-comments into cmake files. Won't work at midnight either.
Change-Id: I80efce78a044f477af56f82cc9d8e85c8544ffbc
Reviewed-on: https://code.wireshark.org/review/2372
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 07:30:43 +00:00
Yan Burman
4aad9d3b58 Fix compilation warning
Change-Id: Ia7922415d8b22ba0c5a04ad6940c7e10bc205d57
Reviewed-on: https://code.wireshark.org/review/2371
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 07:23:38 +00:00
Joerg Mayer
544066530b Fix building uiqt on Windows with the cmake build system:
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-18 06:54:52 +00:00
Pascal Quantin
666127f5f9 PDCP LTE: do not try to decipher PDCP control messages (like ROHC feedback)
Change-Id: I4a1596fd45bbc78ed8e90accf69ac048e7053161
Reviewed-on: https://code.wireshark.org/review/2366
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 06:17:54 +00:00
Evan Huus
6aa1470f10 Replace glib memory with wmem memory
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-18 05:54:53 +00:00
Evan Huus
6e6bd90754 Convert the obvious emem to wmem in lua code.
Bug:9927
Change-Id: Ibf0dd45d3b54e489b70a4fde193b825ec703379e
Reviewed-on: https://code.wireshark.org/review/2349
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 05:54:28 +00:00
Pascal Quantin
04c90090d9 TCP: do desegmentation sanity checks for all sub dissectors types
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-18 05:53:10 +00:00
Jakub Zawadzki
57b27ec250 Optimize tvbparse character set checking.
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-18 05:52:36 +00:00
Guy Harris
c507304d98 If we don't check for something, don't print a result.
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-18 05:47:24 +00:00
Jakub Zawadzki
7bae85acb8 Fix x86 buildbots, revert sse4.2 AM_CONDITIONAL logic
Change-Id: I0b594089753980b58f702e86293028c8dc7e4e54
Reviewed-on: https://code.wireshark.org/review/2363
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 05:39:20 +00:00
Guy Harris
20accf341c Don't do the check for clang/clang++.
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-18 04:58:42 +00:00
Guy Harris
4cebb0686f Add -Werror when testing -m compiler flags.
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-18 04:27:59 +00:00
Balint Reczey
237669a35d Update debian/symbols for the changed library ABIs
Change-Id: I942a92569472e3cecfaee004778561986aee3e69
Reviewed-on: https://code.wireshark.org/review/2357
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 03:58:30 +00:00
Guy Harris
8241b8760c Get rid of the Python stuff, as we've gotten rid of Python plugin support.
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-18 03:22:46 +00:00
Guy Harris
a61ebef1a5 Set the conditional SSE42_SUPPORTED in all circumstances.
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-18 01:23:43 +00:00
Jakub Zawadzki
6664030571 Rewrite check for ws_mempbrk_sse42.c compilation
- 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-17 23:58:52 +00:00
Martin Kaiser
91f58d6714 check for correct ftype
Change-Id: I2274b97c74a845e6514e8acff136e55f721f11a8
Reviewed-on: https://code.wireshark.org/review/2354
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-17 23:08:29 +00:00
Martin Kaiser
c9dd677f61 make dissect_ipmi_cmd() static
Change-Id: Ie494a52fa73f7b91bc65da1bc36516f799ef4967
Reviewed-on: https://code.wireshark.org/review/2353
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-17 22:53:21 +00:00
Gerald Combs
ed38e69235 Make sure we hide columns for live captures as well.
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-17 22:39:09 +00:00
Joerg Mayer
d5e2782629 Update a comment about how to better identify retransmissions
Change-Id: Iec83f7e713a3077f1f4569aa86a55a69684b3097
Reviewed-on: https://code.wireshark.org/review/2351
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 22:37:33 +00:00
Guy Harris
93b5a313ad When building an OS X package for GTK+, put the libraries in lib.
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-17 22:06:12 +00:00
Evan Huus
ba6eb5c72f Set the rlc len field before we try to use it in an expert info.
Bug:9795
Change-Id: I740a9fe36278995cf6e590206f600c037789f0eb
Reviewed-on: https://code.wireshark.org/review/2344
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 21:45:38 +00:00
Evan Huus
f4b9ea4362 Initialize smb ioctl_function struct member
Bug:10020
Change-Id: I415a29dd36697887cb06485d6ed3a2b799a93464
Reviewed-on: https://code.wireshark.org/review/2342
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 21:28:29 +00:00
Tim Furlong
74fec38529 Get QtShark building on Win7 with Qt 5.3.0 using Qt Creator.
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-17 21:02:18 +00:00
Evan Huus
417938310a Initialize rq_hdr.session
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-17 20:54:39 +00:00
Joerg Mayer
43d9a4b151 Simplify obtaining the absolute path of the build dir
Change-Id: If0fabce21d7d12435f4f78768f7193564eeb2bb8
Reviewed-on: https://code.wireshark.org/review/2339
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 19:44:39 +00:00
Joerg Mayer
55cdf038a8 ip version and header-length are not full byte values. Show the
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-17 19:39:27 +00:00
Evan Huus
17a552666b fix underflow in BER constrained bitstrings
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-17 18:17:31 +00:00