URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=65e55393344175be38a4283eafed9d949ac4d90b
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark
Commits:
65e5539 by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):
Generate Diameter's expert info's even when there's no tree so that they show
up in the Expert Infos dialog.
Push the if(tree) check down into the basic type dissectors since we can't
generate/fill the label (which won't be used anyway) when we're not building
the tree (since the proto_item will be faked/NULL).
[Backport includes some tvb_length->tvb_reported_length() changes made in
master.]
Change-Id: Ie4f1f6856cfad0dabc7c58cdee2c16c8fc032c6d
Reviewed-on: https://code.wireshark.org/review/10001
Petri-Dish: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit b4762a043458e5205090282a099184980fb555ea)
Conflicts:
epan/dissectors/packet-diameter.c
Reviewed-on: https://code.wireshark.org/review/10180
Actions performed:
from 21ec666 pcapng: Fixed copying if_filter_bpf_bytes
adds 65e5539 Generate Diameter's expert info's even when there's no tree so that they show up in the Expert Infos dialog.
Summary of changes:
epan/dissectors/packet-diameter.c | 212 +++++++++++++++++++++----------------
1 file changed, 123 insertions(+), 89 deletions(-)