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

Build 2.1.1, second try.

The buildbots that create packages run `perl make-version.pl
--set-release` at the beginning of each build. This in turn sets the
extra version information for our generated packages to "-g<abbreviated
hash>" for development builds, or "" (an empty string) for release
builds.

Hardcoding the extra version information to "-git" in CMakeLists.txt and
configure.ac means we end up with wireshark-2.1.0-git.tar.bz2,
Wireshark-win64-2.1.0-git.exe, etc. for release builds. Set them back to
empty strings.

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

Build 2.1.1.

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

IPv6: Fix jumbo payload length offset

Change-Id: I52fb082782674cc851b246d3b6afa7b4f14bbe34
Reviewed-on: https://code.wireshark.org/review/16434
Reviewed-by: João Valverde <j@v6e.pt>

IPv6: Fix Jumbogram hop-by-hop expert info

Change-Id: I751acad2fad501b700c01a37bafa96d2add8fb36
Reviewed-on: https://code.wireshark.org/review/16433
Reviewed-by: João Valverde <j@v6e.pt>

Update URLs.

(Gotta ensure that there's always at least one commit here that's less
than a year old. :-))

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

MBIM: add dissection of AT&T proprietary UUID

Based on AT&T Windows 8 Extended API Requirements version 1.8.0

Change-Id: Iaf54173812a02023581c530f2340ea21e9e220d9
Reviewed-on: https://code.wireshark.org/review/16431
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>

DHCP: correctly parse PXE options (209-210)

option 209 was marked as opaque, now it's as PXELINUX config file (text)
--> Fix: decorate as non-null terminated string
--> CfR: IETF RFC5071 section 4.2. "Packet Format"

option 210 was marked as special, and erroneously decorated as Authentication
(option 90)
--> Fix: decorate as non-null terminated string
--> CfR: IETF RFC5071 section 5.2. "Packet Format"

Bug: 12618
Change-Id: I4220c137ef4b8b7f0827496c165b0ca35b70f675
Reviewed-on: https://code.wireshark.org/review/16430
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>

ETAG: add explicit casts to please OSX buildbot

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

packet-beep.c: Pacify OS X buildbot with cast

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

proto.c: Unsigned fields should use %u within printf.

Found by VS Code Analysis

Change-Id: I76ea860cd86b41ef33c47dcc8f6b1c122f8bb668
Reviewed-on: https://code.wireshark.org/review/16424
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>

MBIM: add a missing break

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

Add ERSPAN II support for field EN and Index.

Current ERSPAN II dissector does not support parsing EN field and Index.
The patch follows the field description in draft:
https://tools.ietf.org/html/draft-foschiano-erspan-01

Change-Id: I92ce56264be0fb2560c4d1a5da35738cf45a8c96
Reviewed-on: https://code.wireshark.org/review/16400
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>

packet-beep.c: Use strtol over scanf to prevent analysis warnings.

Change-Id: I9244edc537d2eb49d73e097a4cb34bf2cde868e4
Reviewed-on: https://code.wireshark.org/review/16395
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>

LTE RRC: add dissection of schedulingInfoSIB1-r13 field

Change-Id: I226ae82a2d75a9b658a0e9122b4ef1925b003279
Reviewed-on: https://code.wireshark.org/review/16417
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: Anders Broman <a.broman58@gmail.com>

Qt: Allocate packet list records using wmem.

Add PacketListRecord::operator new, which uses wmem_alloc. Roughly
matches the GTK+ UI behavior. Add ColumnTextList which also uses
wmem_alloc.

Lazily allocate our column text.

Change-Id: I86a63cd8ace7764eaab1561bf71b4358af72fe03
Reviewed-on: https://code.wireshark.org/review/16418
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: Anders Broman <a.broman58@gmail.com>

androiddump.c: Use preprocessor directive to distinguish E_AGAIN and E_WOULDBLOCK.

VS Code analysis considers them hardcoded values so the if statement is either
always true or always false.

Change-Id: Iad04add9391c515873e2e00d2c6cbd682fbf5b3f
Reviewed-on: https://code.wireshark.org/review/16419
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix VHT valid checks.

The valid array in a struct mcs_vht_valid is indexed by the bandwidth
and the NSS-1; use the NSS-1, not the NSS, as the index.

The maximum possible value of the NSS is MAX_VHT_NSS, so allow a value
of MAX_VHT_NSS.

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

vwr.c Dynamically allocate large buffers

VS Code Analysis claims the arrays are too large and should be moved to help

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

pcapng.c: Use preprocessor directive to compare G_BYTE_ORDER with G_LITTLE_ENDIAN.

VS Code analysis considers them hardcoded values so the if statement is either
always true or always false.

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

packet-ieee80211-radio.c: Prevent array overflow.

Found by VS Code Analysis.

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

packet-gsm_a_common.c: Create typedef declaration for elem_func signature.

This should keep VS Code Analysis happy.

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

IPv6: Add support for more option types

Change-Id: I1027e6e2481774953216ade6da4785e1a3c5ca63
Reviewed-on: https://code.wireshark.org/review/16357
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>

IPv6: Refactor dissect_opts() into type-specific dissectors

Change-Id: Ife8a7da3bd9bfea347321413bf05ea454186bc6d
Reviewed-on: https://code.wireshark.org/review/16356
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>

ZigBee: fix column description for APS ACK to T2 packet

If this is APS ACK, do not overwrite its column description by Test Profile command description.

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

Speed up col_append_ports on Windows.

Fill in our port information using StringCchPrintf on Windows instead
of g_snprintf. Loading a large-ish test capture here under the VS 2013
profiler showed that we spent 620 samples in col_append_ports. Switching
from g_snprintf to StringCchPrintf reduced that to six samples.

Inline col_snprint_port while we're here.

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

Adding 802.1BR E-Tag dissector

Based on IEEE Std 802.1BR-2012

Bug: 12613
Change-Id: Ic5198471f67a1af728df40a09443a1cab2621169
Reviewed-on: https://code.wireshark.org/review/16402
Reviewed-by: Michael Mann <mmann78@netscape.net>

Support Juniper VN over UDP.

Change-Id: I40dab9d392ddea1f895b88f8f19c1194e56563a2
Reviewed-on: https://code.wireshark.org/review/16408
Reviewed-by: Amitoj Setia <amitoj_setia@yahoo.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

ZigBee MAC parse: fix Association request parse in case of FCS absence.

If it is ok to parse packets with bas FSC, FCS may be even absent. Parse MAC command even if remaining buffer length is less that FCS size in such case.

Change-Id: Ibbc9fed7ab87d0511f8c97db8e0e3bdf562cd15c
Reviewed-on: https://code.wireshark.org/review/16412
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>

Restore setting data.edt in write_specified_fields().

This prevents tshark from crashing when run with "-T fields -e data".

I5778b08c52119b5be1ec482be9417b3c4ba8ed62 mistakenly removed this line (this
'data' is a write_field_data_t rather than the print_data structure that
change was cleaning up).

Bug: 12616
Change-Id: I773e47f12f852e19a20ec29a43eb3a0953923173
Reviewed-on: https://code.wireshark.org/review/16415
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

MBIM: add dissection of Intel proprietary UUIDs

Based on http://www.telit.com/fileadmin/user_upload/products/Downloads/4G/Telit_xN930_MBIM_Command_Functional_Specification_r2.pdf

While we are at it, add placeholder for AT&T proprietary UUID (no dissection of the buffers).

Change-Id: I4f9825d1f9fde474853f9b86a4302742c078d8cd
Reviewed-on: https://code.wireshark.org/review/16413
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>

TCP: fix indent (use 4 spaces)

Change-Id: Id08427246f5b481c004e861719b9b213796438c1
Reviewed-on: https://code.wireshark.org/review/16409
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

IPv6: Simplify RPL routing header dissector

Use a wmem_array to perform strict checking.

Fold cmprI/cmprE dissection into a single loop.

Change-Id: I67443a604b47cd9cbca32c7f7276a7e2229580f1
Reviewed-on: https://code.wireshark.org/review/16348
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>

LTE RRC: upgrade dissector to v13.2.0

Change-Id: If2e15f429e3e35b3deef8afc23e57c8ef3974a22
Reviewed-on: https://code.wireshark.org/review/16410
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>

RLC LTE: fix a typo

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

packet-cql.c: Bugfix bitwise operation with parenthesis.

Change-Id: I93e1c64597f309db5341c6ccadfdb3b23c056182
Reviewed-on: https://code.wireshark.org/review/16397
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>

file-pcapng.c: Apply parenthesis to fix build warnings

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

packet-6lowpan.c: fix uninitialized variable (ipv6_ext) warning

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

packet-btrfcomm.c: Add NULL check to pacify VS Code Analysis

Some if checks are confusing the analysis, but it does add some
future-proofing.

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

Remove T.30 FCF mask.

Found by VS Code Analysis, verified with spec that mask isn't needed.
Also included link to current spec.

Bug: 1918
Change-Id: Ic3e8ee599501c7c12717649579ffd70581622178
Reviewed-on: https://code.wireshark.org/review/16392
Reviewed-by: Michael Mann <mmann78@netscape.net>

Handle dissectors that don't have names.

Dissector handles created with create_dissector_handle() don't have a
name; report them as "(anonymous)" (there's no guarantee that the printf
family of routines don't crash when a null pointer is provided to %s -
the printf routines in at least some versions of Solaris *do* crash in
that case).

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

USB CCID added Interrupt IN and PC2RDR_params

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

ZigBee Test Profile #2 enchancement.

If profile id is ZigBee Test Profile #2, do not try to parse packet contents as other protocol above APS: ZCL or whatever else.

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

Add resource usage logging.

Add log_resource_usage, which prints the current and elapsed user and
system times. Add a usage example in packet_list_model.cpp.

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

Create stub VXLAN (GPE) protocol for Decode As.

Also remove dissector_add_for_decode_as calls as dissector_add_uint
already handles that.

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

HTTP: Add request/response arrows

HTTP has multiple related packets, so seeing which are the actual request/response (related to the current selected packet) is helpful.

Change-Id: I833f4f620cfe8bfe9b1d7518c4e28fbd41b64e29
Reviewed-on: https://code.wireshark.org/review/16385
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>

ceph: distingush between client and server by checking for a second entity_addr_t

The current ceph dissector assumes that the server will always send its
initial connection negotiation first, but that's not necessarily the
case, especially with the kernel client which sends its banner as soon
as the socket is created.

So, we need a better mechanism to determine which end is client and
which is the server. The server sends its own address and then the
address of the client, but the client only sends its own address. We
can determine whether the initial negotiation message is from the client
or server by looking at the data after the first entity addr and seeing
whether it also looks like an entity addr.

This patch takes that approach. It just grabs the address family from
the second address and sees whether it's IPv4 or IPv6. If it's not one
of those, then it assumes that it's not an entity_addr_t at all and is
therefore a request from the client.

We could go farther and try to verify the port and address as well, but
that's probably overkill. The address family is at the same offset as
the host_type field in the client's Connect request, but it's big endian
and the host_type is little endian. As long as we don't end up with
host_types that are 0x200 or 0xA00, this scheme should be OK.

Change-Id: I161d02da86d978272eff95497c6df66766b02ebc
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-on: https://code.wireshark.org/review/16043
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>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Generic Protocol Extension support for VxLAN

Bug: 12323
Change-Id: I53bfedf50ad09cda52320b0e6eb81e92ed73efc8
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/16250

Geneve: Update list of option classes.

Newer versions of the Geneve protocol draft have defined additional
option classes. This updates the list so we can show the class name
instead of unknown.

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

osx-app: small improvement in packaging script.

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

Fix up *some* of the coding style inconsistencies

- return type of a function definition is always on a seperate line
- reformat single line expert items into multiline format
- no space between functionname and (
- reformat some hf_ elements that looked different from most others
- space after , where appropriate
- Fix the following warnings and errors from checkhf.pl
  Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi
  Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi_aid
  Error: hf_ieee80211_ff_dsss_ofdm: FT_BOOLEAN with non-null 'convert' field missing TFS in epan/dissectors/packet-ieee80211.c
  Error: non-null hf_ieee80211_ff_dsss_ofdm 'convert' field missing 'VALS|VALS64|RVALS|TFS|CF_FUNC|FRAMENUM_TYPE|&' in epan/dissectors/packet-ieee80211.c ?
  Error: hf_ieee80211_operat_mode_field_channel_width is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c
  Error: hf_ieee80211_operat_mode_field_rxnss is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c

Change-Id: Ide51d1871755199721e65c0f62b3f6a62ef1159e
Reviewed-on: https://code.wireshark.org/review/16381
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

IPv6: refactor dissect_routing6() into type-specific dissectors

Change-Id: I153c39bb76dc30cecede9dbf5fe4abf234fcd719
Reviewed-on: https://code.wireshark.org/review/16347
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>

hdcp2: don't throw an exception during heuristic check

Change-Id: I24895950464e1845c468f9fa9b6e5aa3ab8c75de
Reviewed-on: https://code.wireshark.org/review/16378
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

iso7816: check for minimum atr len

and reject the packet if it is shorter

make sure that we don't throw an exception when we read the first byte
and haven't yet decided if the packet contains an iso7816 atr

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

BGP: Add support of Vendor Capability 131 (Multisession Cisco)

Issue reported by Garri Djavadyan

Change-Id: I6dd4bd20d82a3f2cb8aa45f740f72d33e33053da
Ping-Bug:12604
Reviewed-on: https://code.wireshark.org/review/16374
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>

BGP: Add (Cisco) for "Vendor" Cisco capability

* Route Refresh Cisco capability (128)
* ORF Cisco capability (130)

Issue reported by Garri Djavadyan

Bug: 12605
Change-Id: Icb19cd6a75315e5af4772dd7833a5b762bdd7ff4
Reviewed-on: https://code.wireshark.org/review/16373
Reviewed-by: Michael Mann <mmann78@netscape.net>

NAS-EPS: Add preference to bypass a heuristic decode of a ciphered NAS.

Change-Id: Ifedb82bbcb29ab978ffb9ce2f485ac9ff0712fc2
Reviewed-on: https://code.wireshark.org/review/16363
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>

Remove a compiler warning some platforms give.

Some UN*Xes declare an index() function, that being the name strchr()
originally had in V7 UNIX. This causes warnings from compilers if you
have a variable named "index", so rename the variable.

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

pvfs2: clean up dissect_pvfs_distribution()

remove unnecessary variable initializers
remove an unnecessary if (tree) check

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

mp2t: use tvb_new_subset_remaining() instead of tvb_new_proxy()

the latter is internal to the tvb code and not meant to
be called from a dissector

Change-Id: Iee5af3d59329aeef8156f0bbbd5c765cac4e314d
Reviewed-on: https://code.wireshark.org/review/16364
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[Automatic update for 2016-07-10]

Update manuf, services enterprise-numbers, translations, and other items.

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

DOCSIS: Added dissector for Downstream Profile Descriptor (DPD)

Change-Id: I97e6e07be45a5c4de6c8c467e0c782b35036bd98
Reviewed-on: https://code.wireshark.org/review/16202
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Cleanup and extend the regex for matching expert info entries.

Match each entity in the structure explicitly rather than skipping a bunch at
the end. This makes it possible to easily (and clearly) specify where we
allow white space.

Don't capture the event group and severity: we don't use them anyway.

Don't put single character matches in []: that makes it hard to read (for
me anyway).

There's no need for both the "m"(ultiline) and "s"(ingle line) options. Nor
the "o"optimize (make buggy) option.

These same changes should/will be applied to the hf regex later.

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

Remember query after closing Follow Stream

Update main filter after follow stream dialog is closed - Use:
   previous_filter if new 'Back' button (passed in follow() method)
   filter_out_filter_ if 'Filter Out This Stream' button (built by appending !current_stream to previous_filter)
   leave filter alone if window closed using Close button or window close. (current stream)

Change-Id: Ic02edeaffdc65ff0f33cac4cb9afb8cde28963c7
Reviewed-on: https://code.wireshark.org/review/16277
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Makefile: Install wireshark.pc too

In my previous patches (8454f2a20e2 and ea16a84ef51) I've tried
to make the pkg-config file more robust. But what I had
completely forgot about is that the file was never installed by
our Makefile rather than we relied on distribution maintainers to
be smart and make the package install the file instead. I've
realized this as soon as I've tried to update wireshark in my
system.

Change-Id: Idb60157a51ea1dd0afd6cfac695bfa5760485241
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-on: https://code.wireshark.org/review/16279
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

randpkt_core: Use g_random_* for randpkt_parse_type().

randpkt_parse_type() can (and most likely will) be called before
randpkt_example_init(), therefore g_rand_int_range is called with a NULL
GRand argument. This produces non-random output.

Change-Id: Id420edc15a5f9dec427c5f1a1dd9a1f18a225319
Reviewed-on: https://code.wireshark.org/review/16367
Reviewed-by: João Valverde <j@v6e.pt>

iso14443: the uid size is a generated item

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

iso14443: expert info for invalid uid size

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

Qt: add assert (CID 1311486).

Change-Id: I62290f1f1c7856ee431705a64fae2022b850234a
Reviewed-on: https://code.wireshark.org/review/16361
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

randpkt_core: change rand() to g_rand_int (CID 1355360).

Change-Id: I48560cbb6007eb16aa545a3e8e6a0e8e3b206930
Reviewed-on: https://code.wireshark.org/review/16326
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

IPv6: Remove obsolete comment

WS_INET6_ADDRSTRLEN should be used instead of INET6_ADDRSTRLEN.

Change-Id: Id937ca72361f4f1b3cad2c18b1067c3fddc527a9
Reviewed-on: https://code.wireshark.org/review/16359
Reviewed-by: João Valverde <j@v6e.pt>

packet-wsp.c: Fix infinite loop in add_headers

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

Fix detection of NSIS/WiX install path when running a win64 CMake

On x86 system:
System32\cmd.exe
ProgramFiles=C:\Program Files

On x64 system:
System32\cmd.exe
ProgramFiles=C:\Program Files
ProgramFiles(x86)=C:\Program Files (x86)
ProgramW6432=C:\Program Files
Syswow64\cmd.exe
ProgramFiles=C:\Program Files (x86)
ProgramFiles(x86)=C:\Program Files (x86)
ProgramW6432=C:\Program Files

Change-Id: I32d52219366b299f1e8099dc6d7737970dc398dd
Reviewed-on: https://code.wireshark.org/review/16346
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>

Check for pcapng files when reading from a pipe.

That way, people don't get confused by an "Unrecognized libpcap format"
error - it's *not* libpcap format!

Also, improve *that* message to say "...or not libpcap data", and put a
period at the end of the error messages.

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

Fix value_string_ext_free() constness

Don't declare destructor as taking a const argument.

Change-Id: I9badfe400718bef41a0e0a00d4b3d1b0bb2879d1
Reviewed-on: https://code.wireshark.org/review/16342
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

IPv6: Remove a memcpy()

Replace CamelCase and remove unnecessary casts too.

Change-Id: Iacf56912448c0e0dc0fe21477d6b71ba9caba69a
Reviewed-on: https://code.wireshark.org/review/16344
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: João Valverde <j@v6e.pt>

fixed some juniper vn dissector bugs

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

GSM RLC/MAC: register dissectors for EC-GSM-IoT control messages

Change-Id: I8fe84cc98b8967c529c07ff17014648610ad8660
Reviewed-on: https://code.wireshark.org/review/16340
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>

MAC LTE: upgrade dissector to v13.2.0

Change-Id: Ic859d69583ca3c342d4775511b68fc276f3290a4
Reviewed-on: https://code.wireshark.org/review/16339
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>

When generating the LUA reference in AsciiDoc then say so.

Generating LUA documentation source for the developer guide says that
it's generating XML, which it did before the switch to AsciiDoc. Fix
this statement.

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

couchbase: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ie1e3b071388b3527bba1088af69d76dcb8d6981a
Reviewed-on: https://code.wireshark.org/review/16333
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>

APRS: more cleanup.

There's no need to create global structures with pointers to the (global) hf's
to pass into the dissection functions. Just reference the global variables
directly.

Remove other global variables passed as arguments while we're at it.

Remove boilerplate comments.

Change-Id: I7ce6b356172aa25983f4cc6a007a0158cb7f26c9
Reviewed-on: https://code.wireshark.org/review/16331
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>

APRS: clean up some header fields.

Try to make the names self-explanatory (without relying on blurbs).

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

Qt: Update scrollbars when change byte view format

Update scrollbars when changing display format between hex and
bits view because the height of the phane will change.

Change-Id: I81556c8dbdfb0a34f6c97e76834646a40aed62bb
Reviewed-on: https://code.wireshark.org/review/16336
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

ZigBee GreenPower: Fix GP Pairing command dissection.

Fix length of Sink GroupID in GP Pairing command.

Change-Id: I5905812456faa0181ee1cc13824a12ce2583d4e0
Reviewed-on: https://code.wireshark.org/review/16335
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

p1: Add BuiltInEncodedInformationTypes.telex

This is for completeness.

Change-Id: Id89f649aa836dd011f0967cdbdc905916b4d2182
Reviewed-on: https://code.wireshark.org/review/16334
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

nbifom: fix no previous prototype for 'proto_register_nbifom' [-Wmissing-prototypes]

Change-Id: I4456cfd6600986b2e0c1cecf7d3054f3e829a210
Reviewed-on: https://code.wireshark.org/review/16332
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Qt: add initializers (CID 1261463).

Change-Id: I5c2d5c73e188586a91dde342d6347d25495e0263
Reviewed-on: https://code.wireshark.org/review/16325
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Qt: add initializer (CID 1269610).

Change-Id: I483e5d3f239f4708f9fc6b11c98869bb1381fb44
Reviewed-on: https://code.wireshark.org/review/16324
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Qt: add initializers (CID 1317257).

Change-Id: I61a63c187990b119b62e99871832913a0e3f75e4
Reviewed-on: https://code.wireshark.org/review/16323
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Handle extcap binaries and the libssh upon which some depend.

Search the extcap binaries for shared libraries they require.

Treat libssh specially - for some reason, when built by macosx-setup.sh
(which just does a standard cmake build of libssh), libssh's shared
library has just libssh.4.dylib, not {installation
directory}/libssh.4.dylib, as its shared library ID, so we don't find
its binary using otool -L.

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

osx-app.sh: add ciscodump.

Ping-Bug: 12471
Change-Id: I7326e43ce8b294c8065e09120d85b4743f1659a9
Reviewed-on: https://code.wireshark.org/review/16321
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Clean up fixed field handling

- Get rid of FF_FIELD macro. Use resoved strings instead.
- Reorder add_ff_ functions so we don't need forward declarations
- Replace add_fixed_field call by call to resolved function
- Remove add_fixed_field and all structs and enums exclusive to it.
- #if 0 out unused function add_ff_relay_capable_sta_info

Change-Id: I9955febb317f3e7c1b9ae28a5ee9c6a6472f7e9c
Reviewed-on: https://code.wireshark.org/review/16328
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

CMakeLists.txt: Fix gcee3e82

Bug: 12589
Change-Id: I7f9be4027214cb7ae4f7b235cba73c088596a80d
Reviewed-on: https://code.wireshark.org/review/16322
Reviewed-by: João Valverde <j@v6e.pt>

APRS: register the storm fields.

There's been a comment here since 2012 about them being unregistered. Put in
some registrations based on a feeble understanding of the specification (these
are all strings, add them as such); that should be close enough and is much
better than the (dissector) assertion we'd get otherwise.

Don't bother putting those hf's in a global structure and passing around the
structure: the hf's are global anyway--just reference them directly.

Add a link to the specification while we're here.

Change-Id: Ia7b17e92a996a1a8eb4a4489eff9fca042190a32
Reviewed-on: https://code.wireshark.org/review/16318
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>

PAPI: Update Header field

Change-Id: I0c2a522ea70e62b6962c99729068e962beb21085
Reviewed-on: https://code.wireshark.org/review/15572
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>

openSAFETY: Simplify handling of SN Fail/Ack

Also add information about error group/code acknowledged,
and additional parameter set missing, if applicable

Change-Id: I911d9941a33ff4064649090908e0fcc2bf6e00f8
Reviewed-on: https://code.wireshark.org/review/16319
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>

configure: Check for working lrelease

The qtchooser package in many (all?) distros installs executable symlinks to
qtchooser that can mislead AC_PROG_PATH if the corresponding Qt linguist
tools package is missing.

Bug: 12570
Change-Id: I98795a3a7b8a05214c56a0c7b50829ea3b2976fa
Reviewed-on: https://code.wireshark.org/review/16316
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>

ATM PW: don't use macros to generate hf entries.

The macros weren't saving much code, were confusing checkhf.pl, and were hiding
useability problems with the fields (such as names equal to the abbreviation
and having several fields with the same abbreviation--things checkAPIs.pl can
check now that the macros are out of the way).

Change-Id: Id2ba67d09ce7dd424aee9d7f2e25eb54fa432d98
Reviewed-on: https://code.wireshark.org/review/16315
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>