aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-30extcap: Use stderr to print error messageRoland Knall8-31/+231
This patch reads out the stderr messages from an extcap utility and displays it to an user. It was tested on Qt but not on GTK, but should work their as well. On Mac OS/X and Windows the child_watch does not behave as it was intended. Therefore in extcap_cleanup, the callbacks are called manually, if and only if, they have not been called already. The reason why it displays two error messages is, that by the time the first one is being displayed, glib has not returned from the spawned process on Linux yet. So there is no way to add the stderr correctly, and putting a handler to stderr into interface_opts will lead to memory errors, cause then the code tries to access memory outside of its protection. Bug: 11892 Change-Id: I2db60dd480fed3e01428b91a705057e4f088bd15 Reviewed-on: https://code.wireshark.org/review/12954 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-30Use correct relative path.Guy Harris1-1/+1
The build is done in epan/wmem, so libwsutil.la is in ../../wsutil. Change-Id: I053f6b925829e9c5e9ded014fbc716abc527b46a Reviewed-on: https://code.wireshark.org/review/16790 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-30ifdef out a variable used only on Windows.Guy Harris1-1/+3
Also, fix identation - tab stops are set every 8 spaces, not every 4 spaces, in UN*X, which is why the mode lines specify that. Change-Id: If7cfc2cdae26feb2d5c13e31a32ed950354fb15b Reviewed-on: https://code.wireshark.org/review/16789 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-30RSVP: Wrong order of Attribute Flags TLVUli Heilmeier1-57/+54
According to RFC 5420 Section 3.1 the MSB is bit zero. Reported by Alexander Okonnikov. Bug: 12652 Change-Id: I9b414464b05ab0724a6560aa441c3f5324130fdb Reviewed-on: https://code.wireshark.org/review/16611 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-30PTP: Expose ptp_v2 value strings for use by other dissectorsAnthony Coddington3-39/+77
Also rename ptp_v2 value strings in packet-ptp for better consistency. TODO: could also be used and combined with definitions in packet-cip. Change-Id: I84a9ae566ae6abdd95910cb5709bb63c2b7c26b8 Reviewed-on: https://code.wireshark.org/review/16781 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-30Add string function times to wmem_test.Gerald Combs5-15/+190
The system, GLib, and wmem string functions can perform differently, particularly on Windows. Start adding performance tests to wmem_test so that we can see the differences. With this change applied "wmem_test --verbose" prints out the following on a Windows 7 x64 VM here. wmem_test is linked against GLib 2.4.20. (MINPERF:g_printf_string_upper_bound (via g_snprintf) 1 string: u 327.602 ms s 0 .000 ms) (MINPERF:g_printf_string_upper_bound (via g_snprintf) 5 strings: u 1419.609 ms s 0.000 ms) (MINPERF:g_printf_string_upper_bound (via g_snprintf) mixed args: u 1606.810 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound 1 string: u 124.801 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound 5 strings: u 140.401 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound mixed args: u 124.801 ms s 0.000 ms) (MINPERF:g_strdup_printf 2 strings: u 702.005 ms s 0.156 ms) (MINPERF:g_strconcat 2 strings: u 78.000 ms s 0.000 ms) (MINPERF:g_strdup_printf 5 strings: u 1419.609 ms s 0.156 ms) (MINPERF:g_strconcat 5 strings: u 93.601 ms s 0.156 ms) (MINPERF:wmem_strdup_printf 2 strings: u 343.202 ms s 0.312 ms) (MINPERF:wmem_strconcat 2 strings: u 93.601 ms s 0.468 ms) (MINPERF:wmem_strdup_printf 5 strings: u 327.602 ms s 8.268 ms) (MINPERF:wmem_strconcat 5 strings: u 62.400 ms s 3.432 ms) Change-Id: Id9b23918829db1719d141e7f830b9eba6245a25b Reviewed-on: https://code.wireshark.org/review/14857 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-30packet-simple: also dissect SIMPLE over TCPPeter Ross1-0/+1
Change-Id: I9310a6fa0b50e54a9e7febb955cdfdab560c4ba9 Reviewed-on: https://code.wireshark.org/review/16779 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-30README.dissector: Add proto_tree_add_bitmask_with_flags()Uli Heilmeier1-0/+9
Extend README with proto_tree_add_bitmask_with_flags() function. Change-Id: Ia984080eda77ab93b063771d625bc45b5b0fc6d2 Reviewed-on: https://code.wireshark.org/review/16785 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-30Move IPv6 inet definitions to wsutil/inet_ipv6.hJoão Valverde4-165/+165
Change-Id: I880adf7fc1e131639f318cdecf7d8e59262d89fb Reviewed-on: https://code.wireshark.org/review/16784 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-30Add GeoIP database UN*X system pathJoão Valverde1-7/+18
Most distros provide GeoIP database packages that install to /usr/share/GeoIP. Use this as a system default. Change-Id: I2b4ddf7e2467263491b18a97e908a247db0ac9a3 Reviewed-on: https://code.wireshark.org/review/16767 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-30IPv6: Add deprecation expert infosJoão Valverde1-3/+19
Change-Id: I111fd8f74388e9e4b7a9d7fd1b582d2fff86cf59 Reviewed-on: https://code.wireshark.org/review/16764 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-30IPv6: Add experimental routing header typesJoão Valverde1-18/+22
Change-Id: I22dfa604abd8ade21d240104bf84af815aa2bc24 Reviewed-on: https://code.wireshark.org/review/16783 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-29ieee80211: PMKID is incorrectly decoded under RSN Vendor specific IE in ↵Alexis La Goutte1-0/+1
EAPOL packet 1 Issue reported by Padmaja Reddy Bug:12675 Change-Id: I17323a70fdbe6f52c350a875c467c233877f4505 Reviewed-on: https://code.wireshark.org/review/16761 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-29Upgrade to libtool 2.4.6.Guy Harris1-1/+1
As per bug 12689, earlier versions of libtool had a bug wherein they assumed a 1-digit second component of the OS version number, and thought OS X 10.10 was OS X 10.1 and used the wrong linker flags. A build from Git would succeed, but a build from the source tarball wouldn't. Change-Id: I412d1e0b02976f44c573f9ff1b62465f5eeaeb05 Ping-Bug: 12689 Reviewed-on: https://code.wireshark.org/review/16773 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-29WiX: Set the "Programs and Features" icon.Gerald Combs3-6/+10
Use our normal application icon in "Programs and Features". Change-Id: I480fcd16b9de1b58852ee8fb5226062da8ed7419 Reviewed-on: https://code.wireshark.org/review/16768 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-29IPv6: Use some macros to set/allocate addressesJoão Valverde1-22/+32
Change-Id: I30430841ff6f3b89cb778aed9e109a885b412a01 Reviewed-on: https://code.wireshark.org/review/16766 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-29GTPv2: fix test for flags in TWAN Identifier IE (CID 1364616)Pascal Quantin1-5/+5
Change-Id: I7b87624bd60f514f2f5e9aafe19bcebf7799bcd1 Reviewed-on: https://code.wireshark.org/review/16772 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-29GTP: fix dissection of NSAPIPascal Quantin1-1/+1
Bug: 12686 Change-Id: Icdf1fd0f24a2f667b27bb957fd932bd9c17ef0f4 Reviewed-on: https://code.wireshark.org/review/16769 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-29IPv6: Dissect unknown routing header types as dataJoão Valverde1-4/+28
Change-Id: I1fa840d24d56643515c6fc8d73967307bf1951d6 Reviewed-on: https://code.wireshark.org/review/16762 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-29Register IPv6 extension header dissectors to "ip.proto" tableJoão Valverde13-145/+168
We may want to add expert infos for IPv6 extension headers over IPv4 (TODO). Any side-effects that don't make sense (e.g: IPv6 Routing over IPv4) are ignored. The IPv6 Next Header decode as is replaced by IP Proto decode as. It didn't fit a conceptual model well and it also was not working very well in practice (for multiple extension headers). We now support decoding any IP Protocol number as an extension header. Bug: 12673 Change-Id: Icbde019aba8990cc556ef2bd832f64cba76c24b6 Reviewed-on: https://code.wireshark.org/review/16681 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-29editcap: fix typosDario Lombardo1-2/+2
Change-Id: I24c455afc51749a665e452312332d167831f19d2 Reviewed-on: https://code.wireshark.org/review/16760 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-29Use xz to compress the source tarball.Gerald Combs7-33/+15
Compress the source tarball using xz instead of bzip2. Other open source projects (including many of our dependencies) have been using xz for a while so hopefully this won't be too much of a shock. Remove the patch-bzip2 Autotools target while we're here. Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d Reviewed-on: https://code.wireshark.org/review/16735 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-29Don't discard unknown coloring rules.Gerald Combs2-3/+3
When processing the colorfilters file, keep and disable unknown coloring rules instead of skipping over and discarding them. This should hopefully keep people from losing the standard "Checksum Errors" rule (and it's less rude in general). Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f Reviewed-on: https://code.wireshark.org/review/16673 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-29extcap: Restore functionality for optionsRoland Knall16-90/+329
Allow stored options to be restored to their default values. This adds a global cleanup method for extcap and globally defined preference values, which fixes the parameter problem with windows Change-Id: I48e0cf846ef81f4732d652c6a2ad0020db5df08e Reviewed-on: https://code.wireshark.org/review/13741 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-07-29Give the WiX installer a full name.Gerald Combs1-1/+2
Append the platform and version to the WiX installer name similar to our other installers. Change-Id: Idb3e7917dda3a8e831062538d3e7d1b1c8b78d42 Reviewed-on: https://code.wireshark.org/review/16757 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-29Enable airpdcap debugging explicitly.Gerald Combs2-11/+13
Enable airpdcap debugging with explicitly with AIRPDCAP_DEBUG instead of _DEBUG. _DEBUG might be defined automatically by Visual C++ depending on your build type and the extra output breaks the decryption tests. Change-Id: If6d918beb4d91233b07a3bc7b6f2f7e1849171f0 Reviewed-on: https://code.wireshark.org/review/16755 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-28Add an ESP decryption test.Gerald Combs3-1/+20
Add an ESP decryption test using the capture+keys from bug 12671. Change-Id: I5f7ce477ec74d59c1043345728a1444842912b96 Ping-Bug: 12671 Reviewed-on: https://code.wireshark.org/review/16733 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2016-07-28Fix build on NetBSD.Thomas Klausner1-4/+4
sys/siginfo.h (which is included by this file) defines si_code. Change-Id: I59cfe1ea3ec01345965028db4bba3223752459e3 Reviewed-on: https://code.wireshark.org/review/16750 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-28IPv6: Fix Decode As to distinguish a null from a hop-by-hop next header.João Valverde1-12/+39
Both display as zero in the UI. We shouldn't have null values for decode as, but we do for IPv6, and the user (also the developer) can't tell them apart from an IPv6 Hop-by-hop Option extension header. NULL values are represented as IP Protocol 255 (Reserved) in the UI, intead of IP Protocol 0 (Hop-By-Hop extension header). Change-Id: I840db99df212a3bee03027b91fdec9c01886004d Reviewed-on: https://code.wireshark.org/review/16746 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-28IPv6: Reduce some expert info PI_PROTOCOL severitiesJoão Valverde1-11/+11
Change-Id: I87bcc47eeee05ea22c646f7ecce9374c070b1ea6 Reviewed-on: https://code.wireshark.org/review/16743 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-28CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX ↵Pascal Quantin1-47/+47
functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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>
2016-07-28IPv6: Fix an incorrect bitmaskJoão Valverde1-1/+1
Change-Id: I81dfcb4fb4b10a9d951247460783f81f464c50b7 Reviewed-on: https://code.wireshark.org/review/16747 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-28[BTLE] Add Version 4.2 to ll_version_number_valsAndersBroman1-2/+3
Change-Id: I88e988e11e1cae6f2f6f6d190890b62f2beb1e92 Reviewed-on: https://code.wireshark.org/review/16745 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-28Fixed compile error in packet-ssl-utils.c when HAVE_LIBCRYPT not definedKim Kempf1-2/+2
Bug: 12680 Change-Id: I7219e38be48d1115e7e80b41337423be64776e5a Reviewed-on: https://code.wireshark.org/review/16742 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-28IPv6: Add expert info for option extension header type mismatchJoão Valverde1-11/+57
Change-Id: If9c4e609528a1b72e6d5a002292734e21650e1eb Reviewed-on: https://code.wireshark.org/review/16713 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-28IPv6: Add support for SMF_DPD option (RFC 6621)João Valverde1-2/+113
Change-Id: I61a1246a3f68aa03e12949e8271dd4cac055b9db Reviewed-on: https://code.wireshark.org/review/16712 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-27Copy over change from Samba repository:Guy Harris1-0/+8
commit ed11ce8f12d567a3e0edc1d24aab1784a171ac33 Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Wed May 4 16:51:37 2016 +1200 Python pidl: avoid segfault with "del obj->attr" Deleting an attribute in Python (using the "del" statement) is (at some stages along a winding path, for C objects) converted into setting the attribute to NULL. Not None, actual NULL. The way we handled this NULL was to dereference it. This changes the behaviour to raising an AttributeError, which is more or less what Python does in similar situations with builtin objects. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Shouldn't affect us, but it makes diffing cleaner. Change-Id: I8e681dc79c8f4e62b74e2aa5ac2b4924134735c4 Reviewed-on: https://code.wireshark.org/review/16741 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Copy over change from Samba repository:Guy Harris1-42/+61
commit f6c79072ca50e05a68b73a80a0ebd635a9bac068 Author: Andrew Bartlett <abartlet@samba.org> Date: Thu Apr 21 21:44:56 2016 +1200 pidl: Correct string handling to use talloc and be in common The previous string handling assumed the python variables referenced by PyString_AS_STRING had infinite life. When they were re-used the C structure started to point at unexpected things. We now check correctly for Unicode in every case, and we always duplicate the string with talloc_strdup() Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: Ib54b62f5630df46cff6fb0582acd109b263142d2 Reviewed-on: https://code.wireshark.org/review/16740 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Copy over change from Samba repository:Guy Harris1-2/+13
commit 90bf114f6370ee837d97e36eb25f38f8234dcd39 Author: Andrew Bartlett <abartlet@samba.org> Date: Thu Feb 25 13:57:37 2016 +1300 pidl: Use a tmp_ctx helper variable This is so we free the ndr_push_struct_blob() return value after we make it into a string Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: I52ee911f89813e6f5a90445be4eb52494e3f69d3 Reviewed-on: https://code.wireshark.org/review/16739 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Copy change from Samba repository:Guy Harris1-1/+1
commit dffa2dbfabca14f07af12663fc93c8dc3bc837cf Author: Andrew Bartlett <abartlet@samba.org> Date: Thu Feb 25 13:57:00 2016 +1300 pidl: Use the $mem_ctx helper variable This is already set to pytalloc_get_mem_ctx(py_obj) Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: I60fddc0a1055095ecad51180c9e1fc2223d2c017 Reviewed-on: https://code.wireshark.org/review/16738 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Copy over change from Samba repository:Guy Harris1-5/+7
commit 9e07f3a13b41be1f019887581b2a2bd049039a3d Author: Andrew Bartlett <abartlet@samba.org> Date: Tue Feb 16 14:06:28 2016 +1300 pidl: Fix our python reference handling The new talloc.BaseObject allow us to hold a talloc context per python object (there may be many referring to the same C object) and the talloc context that the actual object pointer is under. Another advantage is that talloc.BaseObject(), has less of an ABI surface. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: If4a7d9d3f5eb0acf9f94b10af870a0e01fa52b5c Reviewed-on: https://code.wireshark.org/review/16737 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Pick up changes from the Samba repository:Guy Harris1-15/+42
commit 59d530c0b692dae41ea271bfdb473f212615041b Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Tue Mar 1 14:18:52 2016 +1300 ndr: Use ndr_steal to avoid long lists When pulling complex structures like nt-acls, a long list of tokens may be produced. By removing tokens along the way with ndr_token_steal, future calls to retrieve from the token list are not as expensive. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> commit 9af628a488d2b628e6c33917be7030602eeb5fde Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Fri Feb 26 17:01:37 2016 +1300 ndr: avoid unnecessary searches of token list When pulling complex structures like nt-acls, a long list of tokens may be produced. This change means the token list won't be walked in the buffers case if the switch value is not needed. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Change-Id: I0e0ce345e5184e0cd180b0079dd693a7ed3f31ef Reviewed-on: https://code.wireshark.org/review/16736 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Add IPv6 to the randpkt manpageJoão Valverde1-0/+1
Change-Id: Ie8a46f727861319ec51b8390c53da8a0f36ab9ef Reviewed-on: https://code.wireshark.org/review/16732 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-07-27Fix from the Samba repository:Guy Harris2-4/+3
Author: Aurelien Aptel <aaptel@suse.com> Date: Wed May 18 14:23:56 2016 +0200 pidl/ws: fix failing tests This commit fixes 2 test failures in Pidl test suite. - commit 02cd7808 changed the error the test was expecting => update expected output in the test - commit c76b65e changed whitespaces in the output => revert to the old output in the generator Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org> Change-Id: I142d4ae405edfff760c00b95e0475502a1eac2f0 Reviewed-on: https://code.wireshark.org/review/16734 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27If we don't get any OS information, remove the old OS information.Guy Harris1-0/+5
The old information is copied over from one of the input files; if we don't have information about the OS on the machine writing the *output* file, just throw the old information away. (We need a better way to preserve information from the input files; perhaps this: http://www.winpcap.org/pipermail/pcap-ng-format/2016-June/000362.html might work.) Change-Id: Ia25771736d267173f2b6949a91e81e217ee7d16f Reviewed-on: https://code.wireshark.org/review/16730 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Make randpkt generate the correct IP version for IPv6João Valverde1-1/+1
IP version is always 6 and as a consequence of setting the first byte to 0x60 the 4 high-order bits for the traffic class field are set to zero. Otherwise the IPv6 dissector does not look past the first TVB byte, making randpkt useless to exercise the dissector code. Change-Id: I372ab7f71e6c972106f9dd46edec642ca53b9557 Reviewed-on: https://code.wireshark.org/review/16708 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-27[BTLE] Add new Link layer Feature flags.AndersBroman1-5/+19
Change-Id: Ib646d90c6e44075e7ae67f2022dc633fe6423c20 Reviewed-on: https://code.wireshark.org/review/16724 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-27IPSec: fix decryption broken in g8cd167aPascal Quantin1-4/+4
Having no matching in sscanf is a valid use case as the object is already initialized Bug: 12671 Change-Id: Iee7185290ea72968437159c344a376defe464dd4 Reviewed-on: https://code.wireshark.org/review/16711 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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>
2016-07-27ssl-utils: ensure that the cipher suite matches decoderPeter Wu3-70/+80
When the cipher suite for the current decryption session is changed via a Server Hello, it should not change the cipher suite field of the decoder. Otherwise there is a mismatch between the cipher suite and the capabilities of the decoder. Fix this issue by making the decoder hold a pointer to the (constant) SslCipherSuite structure rather than making a copy (and have the decoder point to that data). I also considered resetting the decoder once the cipher suite changes in the Server Hello, but that breaks renegotiation. Bug: 12665 Change-Id: Ieff38a535cd111d95933ec383378643b6fbab7bf Reviewed-on: https://code.wireshark.org/review/16674 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-07-27IPv6: Fix dissection with IPv6 No Next HeaderJoão Valverde1-10/+15
Change-Id: I250e1a7ee236ab50b6da1a9b5d846adc9c970e7e Reviewed-on: https://code.wireshark.org/review/16710 Reviewed-by: João Valverde <j@v6e.pt>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 08:15:42 +0000