git.samba.org - metze/wireshark/wip.git/log

Fix parsing of interface properties strings.

The first entry in the list does not have a leading comma, so a strstr()
for ",{ifname}(" will not work. Instead, use g_strsplit() with a comma
for all of the preferences.

Have common code for all the "uncomplicated" preferences. Have a
specialized handler for the one "complicated" preference.

Change-Id: I2144a98ab0cb70db56eaaba88175d6e03885de2a
Reviewed-on: https://code.wireshark.org/review/7741
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Complete the fix from g6b5c71a.

Change-Id: I18360cbc50d790a22e69e85dcc16363f8c682c64
Reviewed-on: https://code.wireshark.org/review/7739
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Don't cache existing IPv4 and IPv6 hostnames.

In the Qt UI redrawing the packet list redissects our visible packets,
which might call add_ipv{4,6}_name, which sets new_resolved_objects =
TRUE, which emits the addressResolutionChanged signal, which redraws the
packet list, which ...

Break out of the loop by checking to see if we've already cached an IPv4
or IPv6 hostname.

Change-Id: Icb2841e3453fb98d4cf0ea06a0f49737e2b8f25e
Reviewed-on: https://code.wireshark.org/review/7738
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Eliminate decode_bitfield_value from dissectors.

Change-Id: I37f5dbd5e88fd4dd8f736b014d36aae926082d1f
Reviewed-on: https://code.wireshark.org/review/7735
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt: Fix recent files threads

Fix crash and memory leak. Please not that
Recent File Status objects and threads still
continously grow and shrink memory usage, but do not
grow continuously.

Bug: 10893
Change-Id: Icc8b7fefd6572b902ac81d22e5f7b16e304fcf16
Reviewed-on: https://code.wireshark.org/review/7699
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[BOOTP] Try to fix the build boot by casting a variable to 32bits while at
it replace tvb_length() with tvb_reported_length().

Change-Id: Ic2a0c99c20320ddd15d2f4ec173d73229dcf41f6
Reviewed-on: https://code.wireshark.org/review/7733
Reviewed-by: Anders Broman <a.broman58@gmail.com>

DNS: fix Coverity scan (1238867: Missing Break in switch)

Change-Id: I4f1042cebe527874c3f890411f5e44aa71da5d28
Reviewed-on: https://code.wireshark.org/review/7732
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[H248] Use hf fields from the SDP dissector to make it possible to find
related SDP in other protocols such as SIP.

Change-Id: I5fb01128e6070f21b09b4f8364b5650f71fa305e
Reviewed-on: https://code.wireshark.org/review/7719
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[Reassembly] Fix a reassembly case where the two fragments are in the same
frame
but in different SCTP DATA chunks, whitout the patch the message is
reassembled in both chunks leading to duplicated upper layer PDU:s in the
frame.

Change-Id: Ie31142c38c728018178947544b571622447d8e8f
Reviewed-on: https://code.wireshark.org/review/7716
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove proto_tree_add_text from packet-bootp.c

Change-Id: I651211cbe7365409e6c42ef1840122a03460aa42
Reviewed-on: https://code.wireshark.org/review/7731
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove proto_tree_add_text from packet-gtp.c

Change-Id: I53dcee56565e2a82bf0789199ce1c552f622840b
Reviewed-on: https://code.wireshark.org/review/7730
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove proto_tree_add_text from packet-x25.c

Change-Id: I8b08c922515d16350f6f80256564389ae3e408c4
Reviewed-on: https://code.wireshark.org/review/7729
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Qt: Start address resolver timer

Change-Id: Ic3de3db089f25d9fdfd6100f916b3960e52046f0
Reviewed-on: https://code.wireshark.org/review/7715
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

Don't say "Capturing on..." if we're not capturing on.

Only print the "Capturing on..." message if we're actually capturing,
not if we're printing link-layer types.

Change-Id: Icc554776a6a2826276893acb38f7d700effd5f78
Reviewed-on: https://code.wireshark.org/review/7726
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Allow multiple -D/-L/-d/-S flags, only allow one -k flag.

Multiple instances of a single flag from -D/-L/-d/-S should behave like
a single instance of that flag; -D plus -L, for example, is not
supported, but -D plus another -D should be. -k, however, takes an
argument, and we only support one.

Change-Id: I8baced346fbffd75f8d768497213f67bb9a0555f
Reviewed-on: https://code.wireshark.org/review/7723
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix "Save All" for Export Objects.

Fix the loop that goes through all the objects to be saved so that it
looks at all the objects to be saved rather than repeatedly looking at
the first object.

When letting the user select a directory in which to save, restrict them
to looking at directories.

QDir doesn't do what we actually want here - QDir.setCurrent() might do
a chdir() but it doesn't appear to set the QDir's path, so when we use
it to construct pathnames it constructs them based on
wsApp->lastOpenDir() rather than the directory the user selected. Use
Boring Old GLib's g_build_filename(), as we do in the GTK+ version, for
now. (It also does something we *don't* want, namely, at least as the
documentation implies, a chdir().)

Bug: 11062
Change-Id: I705292dc2713b9dba615b0d59a4cf8313f357d82
Reviewed-on: https://code.wireshark.org/review/7720
Reviewed-by: Guy Harris <guy@alum.mit.edu>

MIP6: Add Localized Routing for Proxy Mobile IPv6 (RFC6705)

* Add LRI and LRA Mobility Header
* Add MAG IPv6 Mobility Option
* Remove one proto_tree_add_text

Change-Id: Ib96eddc0a349214d0a112cdd92efe129f97be1ab
Reviewed-on: https://code.wireshark.org/review/7717
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

IP: fix soft-deprecated APIs (tvb_length)

Change-Id: Ifcf70a3eb9fb603e5ba06f90a71184533736c69d
Reviewed-on: https://code.wireshark.org/review/7718
Reviewed-by: Anders Broman <a.broman58@gmail.com>

packet-dcerpc-*: fix alignment of dissect_ndr_ctx_hnd()

Change-Id: I9685f37580d1def6c0956d786398e3e70e819cee
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/7714
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix Wai dissector

- Add description for attribute type, verification and authentication results
- Fix Certificate Authentication Response
  The second signature is optional
- Fix Access WAI Authentication Response
  The Multiple Certificate Verification Result field is actually
  the content of Certificate Authentication Response :
  result plus one or two signature
- FIx CErtificate Authentication request
  THe last filed is optional and it is a identity list

bug: 11061
Change-Id: Ia6710046d8d28ca3c53354f7a997a3d76f09373d
Reviewed-on: https://code.wireshark.org/review/7708
Reviewed-by: cedric izoard <cedric.izoard@ceva-dsp.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

CMake: Fix an uninstall.exe dependency.

Make sure building nsis_package doesn't clobber uninstall.exe.

Change-Id: I8d00adb7fd3813c48118a0690feccb6a06bf15cb
Reviewed-on: https://code.wireshark.org/review/7710
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Update an error message to reflect all the run-dumpcap-and-quit arguments.

Change-Id: I3c270279b4ea044919de5497d373c283ea87c5bf
Reviewed-on: https://code.wireshark.org/review/7709
Reviewed-by: Guy Harris <guy@alum.mit.edu>

DNS: Add CSYNC (Child-to-Parent Synchronization in DNS RFC7477)

Change-Id: Ida53904b4db1ca982055de267ce6f4fdcedd248b
Reviewed-on: https://code.wireshark.org/review/7701
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Add dissection of E-UTRAN Description in Cell selection indicator after
release of all TCH and SDCCH IE

Change-Id: I552c436fe8bea5971863fd7ba023a86aa08f2f0c
Reviewed-on: https://code.wireshark.org/review/7700
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

PCEP, support new drafts:
Conveying path setup type in PCEP messages, draft-ietf-pce-lsp-setup-type-00
PCEP Extensions for Segment Routing, draft-ietf-pce-segment-routing-01

Bug: 11046
Change-Id: Ib2ea9a96079324377fa65ef8c3ab37a98f530793
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/7618
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix for waitpid return EINTR sometimes on launch.

The return of EINTR is not exactly a failure of child process but may be because of any number of reasons. Adding logic to retry to get status of child process.

Bug: 10889
Change-Id: Ic2de7248cb7bd9c801b917c841ce911fb7c17dcc
Reviewed-on: https://code.wireshark.org/review/7669
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove proto_tree_add_text from packet-ssl.c

Change-Id: Icb81649363725c92f94dde5cb28cbba0f6ab5099
Reviewed-on: https://code.wireshark.org/review/7687
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove proto_tree_add_text from packet-synphasor.c

Change-Id: If7cf7ab42ca6a886deb1eab6bc1f391d993e1dad
Reviewed-on: https://code.wireshark.org/review/7677
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Remove proto_tree_add_text from packet-edonkey.c

Change-Id: I42a06b728d807853d2c9b87a18ed36e1e0321085
Reviewed-on: https://code.wireshark.org/review/7685
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Qt: Fix overloaded CPU

QTreeView also use timerEvent() to do something... so call its overloaded
method and make CPU happy again.

Bug: 11035
Change-Id: I405c8c2763ae0b96c0483aedcb314a5f259e76a1
Reviewed-on: https://code.wireshark.org/review/7696
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

Added MPLS over UDP support

Change-Id: Ifdffdf042908c5b4b25704c56d734e9c942d24f4
Reviewed-on: https://code.wireshark.org/review/7690
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

SRVLOC: always intialize prot before calling sscanf

It prevents using an uninitialized variable if sscanf fails

Bug: 11060
Change-Id: I3866d35ae05e8114263fd13a8ccc5e20c3a0d63a
Reviewed-on: https://code.wireshark.org/review/7683
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

[Automatic manuf, services and enterprise-numbers update for 2015-03-15]

Change-Id: Ia77e5cac3d0c79f10d87f21bd4e19bd8187a01ff
Reviewed-on: https://code.wireshark.org/review/7691
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Qt: Sort names in DecodeAs dialog

This should increase user experience.

Change-Id: Id2713e7c5af8ca0f0d87e3ae52542b4f189ace9a
Reviewed-on: https://code.wireshark.org/review/7681
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

Fix copy/pasteo of packet-eigrp.c

Change-Id: I2721086221c435d228bf27aef62f9dc5f6d9ee10
Reviewed-on: https://code.wireshark.org/review/7684
Reviewed-by: Michael Mann <mmann78@netscape.net>

Update Custom.nmake.example with the change done in g2ef72cb

Change-Id: I8d2dc7325da9cd573e87ac924feafe9b55f44a5f
Reviewed-on: https://code.wireshark.org/review/7682
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

TX: Update translations (Manual sync 2015-03-14)

Change-Id: I1aca20f4fd091db5d835d1ee12123a5f7cafe08d
Reviewed-on: https://code.wireshark.org/review/7680
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Support gtpp data record format version older than 6

Bug: 11051
Change-Id: I04b1f1c852b60182ef7f5405716c0b6733d0f44a
Reviewed-on: https://code.wireshark.org/review/7679
Reviewed-by: Michael Mann <mmann78@netscape.net>

Correct comm_type length field.

Change-Id: Ia0cbb36e9962c762648ead8dddd3bb0a794cec74
Reviewed-on: https://code.wireshark.org/review/7678
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt: Fix DecodeAs

Previously DecodeAs neither save its changes nor changes dissector tables.
Do that and redissect packets to refresh view.

Bug: 10553
Change-Id: Icd8453c9650f0265852f6b6b58bc483b35570a15
Reviewed-on: https://code.wireshark.org/review/7676
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

802.11: Fix MAC header Address mapping

A1,A2,A3 and A4 in 802.11 MAC header were not correctly
mapped to SA/TA/DA/RA/BSSID

Change-Id: I050cbb544500d8c3bf3d545f85144ca853079dde
Reviewed-on: https://code.wireshark.org/review/7655
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Remove proto_tree_add_text from packet-eigrp.c

Change-Id: Idb2d9e070c7f65540ad27b011bd4a3dcaa3dd7e4
Reviewed-on: https://code.wireshark.org/review/7667
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add a test-programs target everywhere.

Add a "test-programs" target to each toolchain which builds each unit
test executable. "test-programs" must now be built before running
the unit test suite.

Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090
Reviewed-on: https://code.wireshark.org/review/7673
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

LTE RRC: enhance dissection of Extended Access Barring Category

Change-Id: I6e13ae8c4e95f5915541bc33d89faa61dade2058
Reviewed-on: https://code.wireshark.org/review/7674
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Add packet-opensafety.h to the distribution.

Change-Id: Ifde4b7c276e8e2163a4a5e77bc036393e9e4493a
Reviewed-on: https://code.wireshark.org/review/7668
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Make epan/iana_snap_pid.h the header file of packet-iana-oui.c

Change-Id: I123c591cb0eb83b561163119a4b00c616bcd0990
Reviewed-on: https://code.wireshark.org/review/7666
Reviewed-by: Michael Mann <mmann78@netscape.net>

CMake: Add a top-level nsis_package target.

Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include
file. Add macros to generate packaging-related targets and invoke them
from the top-level CMakeLists.txt.

Add a top-level "plugins" target. Copy plugins to "plugins" in each of
our staging directories instead of "plugins/$VERSION".

Add missing files to the copy_data_files and copy_cli_dlls targets.

Add all files in the NSIS package from the staging directory.

Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT.

Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa
Reviewed-on: https://code.wireshark.org/review/6459
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

MP2T: restore addresses once fragments are added to the hash table

It allows to have "Follow UDP stream" context menu working again

Bug: 11055
Change-Id: I8eae15bfddb45ea033eb8dd2e3f7ca038057421a
Reviewed-on: https://code.wireshark.org/review/7662
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Use FT_FRAMENUM_ACK in SCTP too.

Also fix up the hf description to make it clearer (to me) that this frame number is pointing *to* the ACK, not *from* it.

Change-Id: Ic60e949e65f3988f9ac34fff39d4addc28a1fdbc
Reviewed-on: https://code.wireshark.org/review/7658
Reviewed-by: Anders Broman <a.broman58@gmail.com>

PER: fix dissection of known-multiplier character strings with ub less or equal to 2^b-1

See ITU-T X.691 chapter 30.5 for details

Change-Id: I6ac31494997349c6bff19b196e72859a31634af4
Ping-Bug: 11039
Reviewed-on: https://code.wireshark.org/review/7633
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

checklicenses.py: check the first 150 lines of a file

It should solve the recent failure seen since gdf164df

Change-Id: If86bff18fcd9157941ea843ad5029c9d0b2f0b32
Reviewed-on: https://code.wireshark.org/review/7659
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

One check mark for ACKs, two check marks for dup ACKs.

Add FT_FRAMENUM_ACK and FT_FRAMENUM_DUP_ACK and set them for
tcp.analysis.acks_frame and tcp.analysis.duplicate_ack_frame. Draw a
single or double check mark in the packet list accordingly.

These are probably specific to TCP, but as it happens there are a lot of
TCP packets.

Change-Id: I35416506419159a79ad8cc2e35f8a14485edfb7e
Reviewed-on: https://code.wireshark.org/review/7568
Reviewed-by: Anders Broman <a.broman58@gmail.com>

openSAFETY: Separate definitions into header

To allow future tap interfaces as well as analysis plugins
to use the same definitions the dissector used, all defines
are being separated into a header file

Change-Id: Iec38e361ded46aab6684c2713ba9a047193a6694
Reviewed-on: https://code.wireshark.org/review/7468
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

CMake: Update wslua build and test.

Process wslua/CMakeLists.txt using add_subdirectory instead of
include. Generate files in the build directory instead of the source
directory.

Copy lua scripts to DATAFILE_DIR instead of DATAFILE_DIR/lua. That's
where init.lua looks for console.lua.

Always set WIRESHARK_RUN_FROM_BUILD_DIRECTORY when testing. We
presumably want to test our source files and not files which may or
may not be in the system path.

When we're running from the build directory look for lua scripts in both
the Autotools and CMake build locations.

Change-Id: Ic15ab8c58ff1b170d000c9b3e0a329af2ec44b7b
Reviewed-on: https://code.wireshark.org/review/7590
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: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

GSM_A-BCC: dissector for BCC Protocol

Added dissector for Broadcast call control protocol
(3GPP TS 44.069 version 11.0.0 Release 11)

Change-Id: I179801d30fc2d32d8c4187a92dd0b1c9709711c7
Reviewed-on: https://code.wireshark.org/review/7627
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Don't pass a t4-non-ecm-sig-end to the tap if we didn't see the start of the
data: the invalid frame number will crash Wireshark.

Bug: 10885
Change-Id: I3ae278b77a9449136fbaaac52f2bbaa8a510bf76
Reviewed-on: https://code.wireshark.org/review/7651
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Qt: enable autoscroll on initial capture start

The capture timer was never enabled on capture start or disabled on
capture stop. This is now implemented.

Bug: 10601
Change-Id: Iae23a952986a2c5dddf92b6ac0d1f1bc1c83719c
Reviewed-on: https://code.wireshark.org/review/7582
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Qt: Allow multiple lines in the packet list.

Remove the setUniformRowHeights(true) call in the PacketList
constructor. This means that the packet list now calculates its height
by querying the Qt::SizeHintRole for every item instead of simply
multiplying item_height * number_of_rows.

Implement SizeHintRole in PacketListModel::data so that size
calculations aren't unbearably slow. We don't have any row text until an
item is drawn (via DisplayRole), so items with multiple lines end up
being rendered twice. Note where we make assumptions on line heights.

Although we call gtk_tree_view_set_fixed_height_mode() in the GTK+ UI we
don't have this problem there. GTK+ is apparently less strict about
enforcing row heights.

Bug: 10924
Change-Id: I98e9f4f5f321c2e03f18498e0a7e7556f88792a1
Reviewed-on: https://code.wireshark.org/review/7430
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Export CLIENT_RANDOM with Export SSL Session Keys

This allows for exporting the SSL session keys for captures which were
decrypted using a RSA certificate, but where the server does not support
session resumption.

To avoid frequent reallocations, the expected length is used as initial
string size.

Tested against a nginx server with ssl_session_cache off.

Note that all keys loaded via ssl.keylog_file are exported, not just the
displayed ones!

Change-Id: Ie3a93d3692885502f46442953fa53303d16672d7
Reviewed-on: https://code.wireshark.org/review/7175
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

http2: improve heuristics, remember conversation

Enable the reliable Magic Hello heuristics by default and dissect
further packets as HTTP2 as well. The weak frame heuristics is still
disabled by default.

Change-Id: I783d036fb6c6d867daedf251a5264fdf3b475447
Reviewed-on: https://code.wireshark.org/review/7615
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

DNS: SSHFP Update Algo and fingertype

Change-Id: I78376c5578ee1f1871260db478a9c0d994f5bd38
RFC6594: Use of the SHA-256 Algorithm with RSA, Digital Signature Algorithm (DSA), and Elliptic Curve DSA (ECDSA) in SSHFP Resource Records
RFC7479: Using Ed25519 in SSHFP Resource Records
Reviewed-on: https://code.wireshark.org/review/7654
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ICMP(v4): Remove proto_tree_add_text

Part 2

Change-Id: I4fa4a48fe047b7231f1cf084d8c798ada15372c5
Reviewed-on: https://code.wireshark.org/review/7607
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[Diameter] Add 3GPP AVPs

Change-Id: I1152114ff6b8ea103f0dee3cc9206aefc39db0bc
Reviewed-on: https://code.wireshark.org/review/7653
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ssl,dtls: fix CertificateVerify dissection for TLSv1.2

TLSv1.2 gained an additional SignatureAndHashAlgorithm field for fields
marked with the digitally-signed attribute. This was already implemented
before for ServerKeyExchange, let's reuse that.

Note that the SignatureAndHashAlgorithm tree and fields (hash algo,
signature algo) are repurposed in a different context, but since the
structure is the same it is kept like this.

By the way, add support for DTLSv1.2 too. RFC 6347 section 4.2.6
suggests that the implementation is the same (as far as the dissector is
concerned).

Also update the comments and remove the additional "Signature with
client's private key" subtree since the CertificateVerify message has no
other items.

Bug: 11045
Change-Id: I025901b85e607f04d60357ff14187cc13db2ae5d
Reviewed-on: https://code.wireshark.org/review/7650
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix the Lua FPM dissector test.

In the FPM dissector test, only check the fields produced by the
frame and FPM dissectors.

Change-Id: I212afb8a8a4a7a9aa54391b0d5971b982b819395
Reviewed-on: https://code.wireshark.org/review/7643
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>

Assert that the row number passed to packet_list_get_row_data() is valid.

Unfortunately that row number may come from a dissector/tap but allowing us
to continue just causes us to die horribly later (and we can't except out of
processing a tap).

Change-Id: I37f03385db55dbe55f91e2ec6a03add5664857ba
Ping-Bug: 10885
Reviewed-on: https://code.wireshark.org/review/7652
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Add mip6.mnid.identifier as string with filter string instead of simple text

Change-Id: If9ecbb6ff77fff8131adf526bfec2bb08aa644aa
Reviewed-on: https://code.wireshark.org/review/7642
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Avoid abort on zero-length fields

Since commit v1.99.4rc0-70-g0bec885 (Remove use of sprintf for ftype
string formatting), Wireshark aborts with "Null pointer passed to
bytes_to_hexstr_punct()". This happened with a SSL capture where the
ssl.handshake.extensions_padding_data had a zero length.

Fix it by producing a zero-length string instead (as done by the
previous implementation).

Change-Id: I711d786a9ae692eb44c5e49a30d5fea41c5af31e
Reviewed-on: https://code.wireshark.org/review/7649
Reviewed-by: Michael Mann <mmann78@netscape.net>

Remove use of sprintf for ftype string formatting

Change-Id: I656d6193aad740ab88bf16fb25c202e766e3092a
Reviewed-on: https://code.wireshark.org/review/7616
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix buffer overflow in 802.11 decryption

The sha1 function outputs a multiple of 20 bytes while the ptk buffer
has only a size of 64 bytes. Follow the hint in 802.11i-2004, page 164
and use an output buffer of 80 octets.

Noticed when running Wireshark with ASAN, on exit it would try to free a
"next" pointer which was filled with sha1 garbage. It probably got
triggered via 3f8fbb734915aaf74eb006898e8fabb007afbf48 which made
AirPDcap responsible for managing its own memory.

Bug: 10849
Change-Id: I10c1b9c2e224e5571d746c01fc389f86d25994a1
Reviewed-on: https://code.wireshark.org/review/7645
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>

relay USB control messages without payload to protocol-specific dissectors

at the moment, we don't forward such messages and therefore see lots
of generic USB control messages that could be dissected further

even if there's no data, a protocol-specific dissector may still set
the columns based on conversation info

Change-Id: If3fc0f0ce3bdec1f91b7e3cadc3affd56b8c8969
Reviewed-on: https://code.wireshark.org/review/7584
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>

lbmr: fix possible infinite loop

Ensure that we handle when option_len is zero so we don't go into an infinite
loop. Reported by Vlad Tsyrklevich and found by the "joern" tool. Also fix what
appears to be two misplaced "curr_offset" values which would have resulted in a
bad loop anyways.

Bug: 11036
Change-Id: I79e70fcf79015cb0add1744aff695143e11312aa
Reviewed-on: https://code.wireshark.org/review/7593
Reviewed-by: David Ameiss <netshark@ameissnet.com>
Reviewed-by: Evan Huus <eapache@gmail.com>

RADIUS: Sync with FreeRADIUS Master

commit 37620296eb862aedafe88d417405aba13f9e2b91
Author: Alan T. DeKok <aland@freeradius.org>
Date: Mon Mar 9 16:06:50 2015 -0400

Fix Cisco attributes. Fixes #921

Change-Id: I1a7686eb010b87b576437555ea3e90fe803d3403
Reviewed-on: https://code.wireshark.org/review/7636
Reviewed-by: Evan Huus <eapache@gmail.com>

Minor fix of RFC's number into comment.

Change-Id: I51035034397aa9bc42ed5b4aadc6c7fca52b2d5d
Reviewed-on: https://code.wireshark.org/review/7638
Reviewed-by: Michael Mann <mmann78@netscape.net>

QNET6: check that string is not null before accessing to it

Bug: 11048
Change-Id: I7921f19ad378d6d0b6707251a546c84405b8dcf4
Reviewed-on: https://code.wireshark.org/review/7623
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

ICMP(v4): Enhance display of checksum stuff (like ICMPv6)

Change-Id: I74d0751b9efc3eac99b6bbadf3fe19207e2086db
Reviewed-on: https://code.wireshark.org/review/7609
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ICMP(v4): Remove proto_tree_add_text

Change-Id: Iad5e28aab54a6f22148aa1e81f2dc87fbaf7ccea
Reviewed-on: https://code.wireshark.org/review/7016
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

RADIUS: Update Aruba dictionary (from ClearPass 6.5.0)

Change-Id: I82f4a14d18ad0c1f6911a5cb8c4eebaaa7cd9658
Reviewed-on: https://code.wireshark.org/review/7626
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ICMPv6: Enhance / Update dissector

* Update to the last IANA icmpv6-parameters (2014-01-30)
* Add ICMP Locator Update message (RFC 6743)
* Add RFC 7400 (6LoWPAN-GHC: Generic Header Compression for IPv6 over Low-Power Wireless Personal Area Networks) (Add new ND Option)

Change-Id: I3d6c7f06b6f654e57844046d63c8091e5e33037a
Reviewed-on: https://code.wireshark.org/review/7629
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

VSIP: Add Modelines info

Change-Id: I6b578bad375687651e06508ea9c532bbad3472c8
Reviewed-on: https://code.wireshark.org/review/7631
Reviewed-by: Michael Mann <mmann78@netscape.net>

VSIP : fix initializing 'const void *' with an expression of type 'void (*)(gchar *, guint32)' converts between void pointer and function pointer [-Wpedantic]

Change-Id: Idb7f075f67402d4ca02934a22ad0fd1127c89369
Reviewed-on: https://code.wireshark.org/review/7632
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Update the buildbot URL.

Change-Id: Ia3a9e8e919d3702a4499351df0289294cd10f808
Reviewed-on: https://code.wireshark.org/review/7634
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Bootp: fix typo

Change-Id: I6f6ac0bcb7b1ddc124f161b5cacd046aeef5043f
Reviewed-on: https://code.wireshark.org/review/7630
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

TCP: use curr_num_layer as key for p_(add|get)_proto_data

It allows to properly handle a use case were several TCP connections would be encapsulated
Note that it is safe to use the same key for struct tcp_analysis and proto_tree as they are not using the same scope (and thus list)

Change-Id: I37423eca225960f2e72817f6faf543f6676cf489
Reviewed-on: https://code.wireshark.org/review/7606
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Change a lot of http:// URLs to https://.

Most of our sites are now HTTPS-only. Update URLs accordingly. Update
other URLs while we're at it. Remove or comment out dead links.

Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33
Reviewed-on: https://code.wireshark.org/review/7621
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

SPNEGO: fix compilation without Kerberos

Remove a dead increment while we are at it

Change-Id: I4a453bbd959e71ff6e85be06d079176abdc33a95
Reviewed-on: https://code.wireshark.org/review/7622
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

VSIP: fix extended value string declaration

Change-Id: I10e243bfa33f2e2415c937dcb12fca0578bcb7a9
Reviewed-on: https://code.wireshark.org/review/7620
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

TCP: fix addition of tcp.pdu.size field

Bug: 11007
Change-Id: I902d07f6492bffe5d44f6687be9db53b11b0acd3
Reviewed-on: https://code.wireshark.org/review/7602
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

forces: make redirecttlv robust to invalid lengths

Fixes a potential infinite loop reported by Vlad Tsyrklevich found via the
"joern" tool. I'm pretty sure the semantics of proto_tree_add_item would have
prevented this, but not 100% and making it explicit doesn't hurt.

Bug: 11037
Change-Id: I92049a95d23ca9c233b3fd830637e6bca19a7434
Reviewed-on: https://code.wireshark.org/review/7592
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>

packet-spnego: fix krb5_cfx_wrap without encryption

We need to use rrc, as the checksum is likely to be
rotated before the plaintext payload.

For now we only handle the two common cases
rrc == 0 and rrc == ec...

Ping-Bug: 9398
Change-Id: I548f2f0650716294b6aeb361021be6e44ae8f1b3
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/7271
Reviewed-by: Michael Mann <mmann78@netscape.net>

packet-ldap: use the correct tvb to report the SASL wrapped payload

Ping-Bug: 9398
Change-Id: I163d3dc99562b3388470c58d05e2d4d2e2f6d00c
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/7477
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add Video Services over IP (VSIP) dissector.

Took the original patch from bug 5116 and made the dissector "human readable".

Bug: 5116
Change-Id: Ic5cc35f919865bc84ee8a3d0589f498ef13e8f6f
Signed-off-by: Michael Mann <mmann78@netscape.net>
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/7605
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>

Add support to display unsigned integer "field type" in hex.

Ping-Bug: 10318
Change-Id: Idb8790681cda901788df10fc1484179001bbb35c
Reviewed-on: https://code.wireshark.org/review/7566
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[GTPv2] Dissect ULI Timestamp.

Change-Id: If257831315423e5654cbbc3f6af99703cfad7f90
Reviewed-on: https://code.wireshark.org/review/7614
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ICMP(v4): fix Found soft-deprecated APIs (tvb_length,tvb_length_remaining)

Change-Id: Ib79a55d4f2459119feff29aa06dc8eda8bea6954
Reviewed-on: https://code.wireshark.org/review/7608
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ui uitls (Qt): fix parameter 'val' not found in the function declaration [-Wdocumentation]

Change-Id: I5fb1afca4b412697c56d80a8eb7be4140cd9420f
Reviewed-on: https://code.wireshark.org/review/7612
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>