Commit Graph

58516 Commits

Author SHA1 Message Date
Pascal Quantin 45872b9f7b checkAPIs.pl: proto_tree_add_bytes_item takes an encoding parameter
Change-Id: Iebe0e2483d9fd1661bf87ea5efaeb4ae14f6e105
Reviewed-on: https://code.wireshark.org/review/9027
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-22 18:41:03 +00:00
Alexis La Goutte a94b4434cc NCP: fix comma at end of enumerator list [-Wpedantic]
Change-Id: I47795fb9e1044f4319721c3bf1208c269a4b9c34
Reviewed-on: https://code.wireshark.org/review/9023
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-22 17:48:01 +00:00
Alexis La Goutte d23d53edcd ws80211_utils.h: fix empty paragraph passed to '@param' command [-Wdocumentation]
Change-Id: Iecd9f8820840959a2f226120cbc359977d20c757
Reviewed-on: https://code.wireshark.org/review/9009
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22 17:02:38 +00:00
Alexis La Goutte c079420cfc PKCS12: Remove from ASN1 DIRTY list
Change-Id: I454c48d5342ebe5682217667e4cafd6164e58d41
Reviewed-on: https://code.wireshark.org/review/9004
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: Evan Huus <eapache@gmail.com>
2015-06-22 17:02:11 +00:00
Alexis La Goutte 475a232a5b PKCS12: fix unused function 'dissect_AuthenticatedSafe_PDU' [-Wunused-function]
Change-Id: Iaaaaffc8a271ac844b745d1b9265eb06df2efe9c
Reviewed-on: https://code.wireshark.org/review/9003
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22 17:01:52 +00:00
Gerald Combs 02b497743c Add a strlen cast.
Change-Id: I480e2e7436f0334f0dfd99352bd49304765fcee3
Reviewed-on: https://code.wireshark.org/review/9021
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-22 15:53:35 +00:00
Michael Mann 8f390d4975 Refactor RTD stats.
Very similar to the refactoring of SRT stats, it provides more commonality of the stats for all GUI interfaces.  Currently implemented for TShark and GTK.  Affected dissectors: MEGACO, MGCP, Radius

Change-Id: Icb73a7e603dc3502b39bf696227fcaae37d4ed21
Reviewed-on: https://code.wireshark.org/review/8998
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>
2015-06-22 15:13:39 +00:00
Alexis La Goutte 8b230eabdd Fix make distcheck buildbot
packet-dnp.c:2735:28: error: variable 'al_filename' set but not used [-Werror=unused-but-set-variable]
packet-dnp.c:1843:32: error: variable 'al_filename_offs' set but not used [-Werror=unused-but-set-variable]

Change-Id: Ia84b270aa8f56fb4104fb875339dc3d39c6105c6
Reviewed-on: https://code.wireshark.org/review/9020
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-22 14:53:20 +00:00
Bill Meier c0f5b2396a [pcep] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for certain multibyte fields.
Change-Id: Idc31728ce1b327ff86a58541ba01275107c7598b
Reviewed-on: https://code.wireshark.org/review/9019
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-22 14:26:46 +00:00
Bill Meier cb7fd6fb39 [rfid-pn532] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for several 3-byte fields.
Change-Id: If70a45d59fdce105b429d00fbbc4a8b2784262a2
Reviewed-on: https://code.wireshark.org/review/9018
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-22 14:26:18 +00:00
Alexis La Goutte ce40ea35b0 service_response_time_table.h: fix parameter 'gui_data' not found in the function declaration [-Wdocumentation]
Change-Id: Ie214d654aa91b91da2a1435dce63a822e404669a
Reviewed-on: https://code.wireshark.org/review/9010
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-22 13:50:49 +00:00
Michal Labedzki c52dc98563 Fix typo caused assertion
Invalid character ')' in filter name 'gsm_abis_rsl.llsdu.sacch)'
**
ERROR:wireshark/epan/wmem/wmem_core.c:50:wmem_alloc: assertion failed: (allocator->in_scope)
Aborted

Change-Id: Ie22035cf9a9d1d29354a64cd5b085f1c2e18b1d3
Reviewed-on: https://code.wireshark.org/review/9017
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-22 07:50:10 +00:00
Vasil Velichckov eb2dffa56c GSM MAP: Fix decoding of IPv6 addresses
From 3GPP 23.003

The GSN Address is composed of the following elements:
1) The Address Type, which is a fixed length code (of 2 bits) identifying the type of address that is used in the
Address field.
2) The Address Length, which is a fixed length code (of 6 bits) identifying the length of the Address field.
3) The Address, which is a variable length field which contains either an IPv4 address or an IPv6 address.
Address Type 0 and Address Length 4 are used when Address is an IPv4 address.
Address Type 1 and Address Length 16 are used when Address is an IPv6 address.
The IP v4 address structure is defined in RFC 791 [14].
The IP v6 address structure is defined in RFC 2373 [15].

Currently the Wireshark decodes IPv6 addresses as IPv4

This commit reverts parts of commit 1cdef1d98a

Change-Id: I4905d4cf559abcb42b9dfe3652667d2ff96dd444
Reviewed-on: https://code.wireshark.org/review/8984
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-22 06:00:14 +00:00
Michael Mann e8a238fce2 Eliminate proto_tree_add_text from some dissectors.
Change-Id: I979990e9385182870ce4809a7e6fa16e598cb2be
Reviewed-on: https://code.wireshark.org/review/9016
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-22 05:42:42 +00:00
Michael Mann d729d8055b Convert "macro checks" to use expert info in line with dissectors with comparable checks.
Change-Id: I30affba4941ba150c34541bfba67ff8da5b52a17
Reviewed-on: https://code.wireshark.org/review/9015
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-22 05:35:50 +00:00
Bill Meier 1223ba5250 [bmp] minor cleanup
- Simplify some code;
- Remove unneeded initializers;
- Remove some unused code;

Change-Id: I30b6a7751845670b732eae8ec143cd23e57fc54c
Reviewed-on: https://code.wireshark.org/review/9014
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-22 02:14:21 +00:00
Alexis La Goutte 31f54593dc PKCS12: fix warning about unused parameter when don't build with LIBGCRYPT
Change-Id: I7cc47f811d6c090aa2be54d3d92361966d011ccd
Reviewed-on: https://code.wireshark.org/review/9002
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-21 22:43:16 +00:00
Evan Huus ebc8ec83fd Remove deprecated tvb_length from a bunch of dissectors
Change-Id: I5c777806cb1403062a9d85261149d722df57b239
Reviewed-on: https://code.wireshark.org/review/9005
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-21 22:38:59 +00:00
Evan Huus a2e2c1f997 Fix memory leak printing eui64s
The scope that is passed in should only be used for the return value - other
temporary buffers we must alloc/free ourselves, since if the scope is NULL they
will not be managed automatically.

Bug: 11293
Change-Id: I27be856f1c5cdf47f78e766192a29523664a543e
Reviewed-on: https://code.wireshark.org/review/9007
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-21 18:40:01 +00:00
Alexis La Goutte 27fc2b7985 ERM (Aruba): Fix Assigned value is garbage or undefined found by Clang Analyzer
Fix also trailing whitespace

Change-Id: I9e9e09f6855f41609581ea1b7cd1bd16b15f85f4
Reviewed-on: https://code.wireshark.org/review/9006
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-21 16:26:03 +00:00
Gerald Combs 56880d782d [Automatic update for 2015-06-21]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I266509d729803494666458651ab3ae88cac50a21
Reviewed-on: https://code.wireshark.org/review/9012
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-21 15:09:43 +00:00
Martin Mathieson 6c3f1f2c53 editcap: split usage output so won't wrap in cmd.exe window
Change-Id: I8a8ed3721e525ceb685f8e105147a0cc012fc912
Reviewed-on: https://code.wireshark.org/review/9001
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-21 12:19:22 +00:00
Michael Mann 7d70d3ea70 Remove now unneeded tap-srt.h
Change-Id: Ic625f5a0f8e3c4d70dd04f5e3eb7100fb54027e5
Reviewed-on: https://code.wireshark.org/review/8997
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-21 12:00:05 +00:00
Martin Mathieson 649c48482e editcap: trivial changes while looking into the -L option
Change-Id: I94dd83af160eebb9dc44c123b2b83674bc5866f6
Reviewed-on: https://code.wireshark.org/review/9000
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-21 11:47:24 +00:00
Alexis La Goutte 334087b9e4 srt_table: fix conversion shortens 64-bit value into a 32-bit value
Change-Id: I62d04fc2c02c393fd15bccbdfe194c557665dc0e
Reviewed-on: https://code.wireshark.org/review/8999
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-21 05:42:59 +00:00
Michael Mann 6de6f7f0f8 Further refactor SRT stats.
Create "common" SRT tap data collection intended for all GUIs.   Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK.

SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic.
CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone.

Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc
Reviewed-on: https://code.wireshark.org/review/8894
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-21 03:35:13 +00:00
Guy Harris 2895d58dc3 Call the "802.11 radio information" dissector for radio headers.
Have dissectors of various forms of radio information headers in the
packets fill in a struct ieee_802_11_phdr with radio information as
appropriate, and call the "802.11 radio information" dissector rather
than the raw 802.11 dissector.

This means that the radio information can be found in a
protocol-independent and encapsulation-independent form when you're
looking at the packet; that information can be presented in a form
somewhat easier to read than the raw metadata header format.

It also enables having a single "radio information" tap that allows
statistics to handle all different sorts of radio information
encapsulation.

In addition, it lets us clean up some of the arguments passed to the
common 802.11 dissector routine, by having it pull that information from
the struct ieee_802_11_phdr.

Ensure that the right structure gets passed to that routine, and that
all the appropriate parts of that structure are filled in.

Rename the 802.11 radio protocol to "wlan_radio", rather than just
"radio", as it's 802.11-specific.  Give all its fields "wlan_radio."
names rather than "wlan." names.

Change-Id: I78d79afece0ce0cf5fc17293c1e29596413b31c8
Reviewed-on: https://code.wireshark.org/review/8992
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-20 23:02:21 +00:00
Martin Kaiser 77ed0387c6 (trivial) fix a spelling mistake in a comment
Change-Id: I3f9feab57032c8c701c4ea487c0f5acca428d5d9
Reviewed-on: https://code.wireshark.org/review/8995
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-20 23:02:02 +00:00
Martin Kaiser 02537f8c86 [mifare] make the payload of the write command filterable
use an FT_BYTES variable instead of passing it to the data dissector

Change-Id: Ia52cba24dedec13c9842109d45b3a277ee627f42
Reviewed-on: https://code.wireshark.org/review/8994
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-20 23:01:41 +00:00
Martin Kaiser bc9e141f83 [mifare] minor cleanup
remove the if(tree) so that we fill the info column regardless of the tree
clear the info column first, then append our data
remove an unnecessary initializer

Change-Id: I0e9e9582f360dd929e422f994c3d4a644c602642
Reviewed-on: https://code.wireshark.org/review/8993
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-20 23:01:21 +00:00
Guy Harris debb81119c Use "Present"/"Absent" for presence bits.
That's clearer than "True"/"False".

Change-Id: I300c040f347eff8477a87f639bea8402772314b9
Reviewed-on: https://code.wireshark.org/review/8991
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-20 22:42:15 +00:00
Guy Harris bffabc706b Support the "number of extension spatial streams" information.
Change-Id: If69088aac0848d6ec8d239e3a9acc140ad376d6f
Reviewed-on: https://code.wireshark.org/review/8990
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-20 22:24:19 +00:00
Pascal Quantin 5714ad5e8b ftypes: display BASE_HEX_DEC integers as hexadecimal
Bug: 11292
Change-Id: I69a5591996bec77c2cb2bfcd04e9179784470edf
Reviewed-on: https://code.wireshark.org/review/8987
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>
2015-06-20 13:59:40 +00:00
Alexis La Goutte 4c898c3e74 qt_ui_utils: fix parameter 'glib_string' not found in the function declaration
Only a small typo glib_string => glib_gstring

Change-Id: Ia3ad0a8086f6c1a47065754dee33eff1e0ad770f
Reviewed-on: https://code.wireshark.org/review/8988
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-20 13:45:59 +00:00
Bill Meier a8ddf90e12 [rpcrdma] Do some minor bug-fixes and cleanup
Change-Id: I9d440cba281945672767642967d955351fa67b90
Reviewed-on: https://code.wireshark.org/review/8985
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-19 19:47:53 +00:00
Bill Meier d47a6865d9 [rtse] Convert tabs to spaces to match editor modelines
Change-Id: I03c7decacd4def0552f461c81c4e634a85380438
Reviewed-on: https://code.wireshark.org/review/8986
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-19 19:32:05 +00:00
Bill Meier 4d3abcc9cc [thrift] fix a minor bug; Also: use col_clear()
Change-Id: I07dc57583f2e78b6b841a7adb5470e57fa314786
Reviewed-on: https://code.wireshark.org/review/8969
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-19 13:35:24 +00:00
Matthieu Coudron aa8fcb30a5 Improved dissection of some netlink attributes
Added missing strings to netlink_route_ifla_attr_vals
Improved dissection of netlink.hdr_flags
Replaced deprecated use of tvb_length_remaining

Change-Id: Ie16f7e602e1fb69a0a88a4d0657ec2d6da3c0d83
Reviewed-on: https://code.wireshark.org/review/8916
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-19 13:33:21 +00:00
Pascal Quantin e43ff89f51 recent.c: accept an UTF-8 string in read_set_recent_pair_dynamic() function
Previous code was checking that the string was ASCII, which does not work when
the recent capture files list contains non ASCII characters

Change-Id: I1ea96035cca4b2aa2ea5061e7a4f98e78ac88f20
Reviewed-on: https://code.wireshark.org/review/8965
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-19 13:30:56 +00:00
Michal Labedzki 7ec7e43f3b Bluetooth: Coverity fixes
Try to fix Coverity issues in Bluetooth HCI and androiddump.

Change-Id: Id2ed35130eb4dbb0698b7a54afccdba56af62bfd
Reviewed-on: https://code.wireshark.org/review/8983
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-19 13:20:57 +00:00
Pascal Quantin 9e4b299d2c Qt: remove some compilation warnings
Change-Id: If14d6b46cfb3d42798afdaa0721f9892af93fddc
Reviewed-on: https://code.wireshark.org/review/8981
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-18 21:31:50 +00:00
Guy Harris d9b36c46d0 Pass the 802.11 pseudo-header as an argument.
Rather than accessing it through pinfo->pseudo_header, have it passed as
an argument.

This means we no longer tweak the pseudo-header filled in by libwiretap,
but instead construct our own pseudo-header, which is a bit cleaner.

It also opens up the possibility of other dissectors passing radio
information down to the 802.11 dissector, so it can display it in a
better-organized format than the raw metadata headers for
radiotap/PPI/Prism/AVS/etc., and having some of the options for 802.11
dissection (Atheros padding, Centrino stuff, etc.) also passed in
through that pseudo-header so we have fewer arguments to
dissect_ieee80211_common().

Change-Id: I470300a0407ebf029c542f7ca5878593563a70a9
Reviewed-on: https://code.wireshark.org/review/8980
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-18 20:13:50 +00:00
Gerald Combs f00e6fbefe 1.99.7 → 1.99.8
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17
Reviewed-on: https://code.wireshark.org/review/8979
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-18 20:04:03 +00:00
Gerald Combs 03c02f3321 Build 1.99.7.
Change-Id: Ia990ad2c9a56ef41b1ed82509afe18079bdc451f
Reviewed-on: https://code.wireshark.org/review/8978
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-18 17:04:18 +00:00
Joerg Mayer d8529ba64d Add ExtremeNetworks attribute 213 (and the source of the information)
Change-Id: I2fe561eef38ecc31693270b527af1f42ef564734
Reviewed-on: https://code.wireshark.org/review/8977
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-18 14:49:55 +00:00
Pascal Quantin 8cbd144453 Bluetooth: ensure to give bluetooth_data structure to dissect_eir_ad_data()
Bug: 11285
Change-Id: I1d3a4900fe3daec6f8d7596a9925322063f2c4eb
Reviewed-on: https://code.wireshark.org/review/8976
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-18 14:39:55 +00:00
Bill Meier 2391fe5731 [aeron] Remove unneeded initializers
Change-Id: Ifa129c221b5df9120a0c475edc2109775f84ae35
Reviewed-on: https://code.wireshark.org/review/8974
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-18 13:32:06 +00:00
Pascal Quantin 05554f80f4 Asterix: field array must be NULL terminated
Bug: 11287
Change-Id: Iffcaa1cd2663768f616aedb550a101b7196e456b
Reviewed-on: https://code.wireshark.org/review/8975
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-18 10:33:10 +00:00
michal.orynicz c6c90431e8 Add possibility to export Logcat Text PDUs
Enable exporting PDUs from Logcat Text, so they can be saved as pcapng.

Change-Id: I413055d7706d245525609a9a4cbe9e02e8d99a0f
Reviewed-on: https://code.wireshark.org/review/8904
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>
2015-06-18 09:48:56 +00:00
Alexis La Goutte 247f596b11 BTLE: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I818ba409a01b2ae2701d22f97340183df42cd075
Reviewed-on: https://code.wireshark.org/review/8962
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-18 05:49:31 +00:00