summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-11-10tcp: Fix Follow TCP tap data and when its tapped.Michael Mann7-50/+309
Use the model from the 2.0 branch and earlier that only "tapped" the follow data in a single location. This fixes duplicate data for reassembled data and handles out-of-order packets. Bug: 12855 Change-Id: I5268f13e3c08e9271acf026b859de693ad794c94 Reviewed-on: https://code.wireshark.org/review/18368 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>
2016-11-10lsd: fix unaligned readPeter Wu1-1/+2
Fixes UBsan complaint: epan/dissectors/packet-lsd.c:141:7: runtime error: load of misaligned address 0x61d00017029e for type 'const guint32', which requires 4 byte alignment Change-Id: I74034f3e0bc198b4b86ca6cd7559d8df7283377f Reviewed-on: https://code.wireshark.org/review/18733 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>
2016-11-10Enable exporting IMF traffic as an EML fileMoshe Kaplan11-3/+146
Change-Id: Ia56b38a770a148dd8bf030699615189601944cc2 Reviewed-on: https://code.wireshark.org/review/18656 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-10PROFINET: Update MRP dissection according to IEC62439-2 Ed.2.Birol Capa2-55/+190
The MRP PDU dissection is updated with respect to MRP standard IEC62439-2 Ed.2. 0x88e3 is added for MRP Ether Type String definions of MRP block and sub block types are updated. dissect_pn_ManuData function is removed since it is not used anymore. Change-Id: Iec6666abc75bcba4189f2c38851407abc23267f9 Reviewed-on: https://code.wireshark.org/review/18730 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2016-11-10Qt: Handle retranslation events in the main window.Gerald Combs11-84/+126
Update most (but not all) of the main status bar text when the user changes the language setting. Try to distinguish between recent preferences and recent captures more clearly. Change-Id: I5278a503178fe3620a25b185742688f957dc30f4 Ping-Bug: 11307 Reviewed-on: https://code.wireshark.org/review/9575 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-10bt-dht: add data to COL_INFO.Dario Lombardo1-0/+1
Change-Id: I69e8b012156020f79cf22604bc709fc70f215155 Reviewed-on: https://code.wireshark.org/review/18710 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>
2016-11-10androiddump: Set socket connect() timeout to 500msMichal Labedzki1-1/+24
This should avoid neverending or long time to obtain timeout in some cases like firewall's drop rules, etc. Bump version to 1.0.4 Bug: 13104 Ping-Bug: 13114 Change-Id: I9bef714b6d92b3516a2a95ebdbe1ba594fa60e34 Reviewed-on: https://code.wireshark.org/review/18728 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-10GVSP: Disable the heuristic by defaultAlexis La Goutte1-1/+1
Already try to enhance but get always some false positive with STUN/RTP Change-Id: I187959ed526a0d538a2c6db76af07ae3dbf06c6e Reviewed-on: https://code.wireshark.org/review/18702 Reviewed-by: thies.moeller <thies.moeller@baslerweb.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-09debian-setup: allow libssh-dev to be installed for trustyPeter Wu1-12/+24
Ubuntu 14.04 Trusty has libssh-dev 0.6.1 (using OpenSSL) which should be usable. The debian/control file is not updated due to OpenSSL licensing concerns, if you need to build on trusty, you need dpkg-buildpackage -d (--no-check-builddeps). Remove distro-detection in favor of feature detection. Note that the minimum Ubuntu versions could be lower, but unsupported versions are not listed on packages.ubuntu.com so I did not bother. Change-Id: Ia04d960f3d4957918c925bf9cd351537e233fd3e Reviewed-on: https://code.wireshark.org/review/18725 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-11-09CMake: Use xz generator with cpackJoão Valverde1-2/+8
We already do so with autotools. Change-Id: I0d7ea052ee19a42d16e82134f2f7188b3a19ee1e Reviewed-on: https://code.wireshark.org/review/18727 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com>
2016-11-09CMake: fix cpack archive name to include versionDario Lombardo1-20/+26
CPACK_PACKAGE_VERSION is used before setting its value. Remove spurious CPACK_SYSTEM_NAME usage. Before: CPack: - package: wireshark/build-test/wireshark--.tar.bz2 generated. After CPack: - package: wireshark/build-test/wireshark-2.3.0.tar.bz2 generated. Change-Id: I6f12017113f64b9c759a3fbd930cb3ee0807811d Reviewed-on: https://code.wireshark.org/review/18669 Reviewed-by: João Valverde <j@v6e.pt> Tested-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: Peter Wu <peter@lekensteyn.nl>
2016-11-09Add DHCPv6 options for Softwire provisioningNiels Widger1-0/+247
Bug: 12719 Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Signed-off-by: Sander Steffann <sander@steffann.nl> Change-Id: I2792ef4a5851cd2fba75fc253aa3d635cb7f1fa6 Reviewed-on: https://code.wireshark.org/review/16860
2016-11-09CMake: Enable ccache for gcc and clang.Gerald Combs2-0/+11
Add an option to check for and use ccache. Disable it by default. Change-Id: Ifc928d22715b7e06e53115455b31dbeaf2ee8332 Reviewed-on: https://code.wireshark.org/review/18715 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-09CMake: Use find_program to find a program.Gerald Combs1-3/+3
Use find_program to find glib-compile-resources instead of find_file. Change-Id: I565c3a596923ff4761bc38988ee396aa24bd63a6 Reviewed-on: https://code.wireshark.org/review/18714 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-09[SIP] Use call_dissector_only() to call the diagnostics dissector.AndersBroman1-2/+2
While there correct a typo. Change-Id: I58f9f4353e1fb4155d4f4f77f0f93325940d291f Reviewed-on: https://code.wireshark.org/review/18722 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-09diameter_3gpp: update gx_feature_list_1 3GPP TS 29.212, v14.0.0Jan Spevak1-1/+22
Change-Id: I9995f718ab323b48408951a7df792b7b72ce3c8f Reviewed-on: https://code.wireshark.org/review/18720 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>
2016-11-08Qt: Restore the default "About" box tab.Gerald Combs1-1/+1
Set the default about box tab back to "Wireshark". (Presumably this changed due to Qt Creator's annoying last-tab-selected-wins behavior.) Change-Id: I85f64b623758a14e9588f6b3929bad26a6a60ad5 Reviewed-on: https://code.wireshark.org/review/18716 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-08cmake: install missing profiles directoryPeter Wu1-0/+1
Spotted when comparing an autotools "make install" tree with the cmake one. Change-Id: I68eed5f518a72a6476c3e464a6997f0b3855144e Reviewed-on: https://code.wireshark.org/review/18713 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-08cmake: fix the linker flags test for Visual StudioMartin Kaiser1-2/+2
ddd1c87d43781533c3ec10279857e3870d12437e modified the order of linker command line options. This broke the tests and made invalid linker flags seem valid. (Link target) -> LINK : warning LNK4044: unrecognized option '/Wl,--as-needed'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj] LINK : warning LNK4044: unrecognized option '/pie'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj] The simple fix is to add specific options for Visual Studio and clang at the beginning of the linker's command line options rather than at the end. Change-Id: I6492ea1271e18be0d190e7579f47baecf6ac4d61 Reviewed-on: https://code.wireshark.org/review/18709 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-11-08ERF: Fix issues with Host ID mappingAnthony Coddington3-63/+117
packet-erf: Fix Host ID/Source ID showing for all extension header types. Only show generated Host ID/Source ID when there is a Host ID extension header or there was not one on the record. Assumes there is only one Source ID if multiple Flow ID extension headers (unlikely) and that it matches the one in the Host ID header. This is consistent with other tools. Does support multiple Host ID extension headers though. Fix dag_version tag short name. Was clashing with another tag due to typo. ERF wiretap: Don't conflate Host ID 0 with implicit Host ID. While the implicit Host ID defaults to 0, it is not the same thing as seeing a packet with Host ID explicitly 0 in the extension header which means explicitly unknown source. Store the initial (unknown) implicit Host ID interface mapping in it's own special mapping table entry rather than 0. Noticed we can currently get duplicate interfaces in the unusual event of mixed implicit and explicit Host ID packet extension headers for the same ID before we discover that mapping. Consistently abandon the implicit version for consistency with the dissector linking behaviour and mark the interface as unmatched in the description. In 2 pass mode (including normal Wireshark file open) the abandoned interface ends up with no packets. In the common cases (all Host ID or no Host ID on packet records) this duplicate interface will not be created in the first place. Change-Id: Ic5d0b2ce9aae973f1693a247cf240ef1324ff70a Ping-Bug: 12303 Reviewed-on: https://code.wireshark.org/review/18704 Reviewed-by: Stephen Donnelly Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-08GSM A: allow a length of 3 bytes when using the 'no identity' typePascal Quantin1-1/+1
As stated in 3GPP 24.008 §10.5.1.4, for GMM and EMM procedures the length should be set to 3 when using the 'no identity' type. Change-Id: Ib2d5930416b0d26853f4cc430df0ce2f29488877 Reviewed-on: https://code.wireshark.org/review/18707 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-08print.c: fix ek outputPascal Quantin1-1/+1
follow-up of g1b91475 Bug: 13086 Change-Id: I7171c50a0b113e3036860941b586e96a068fea9e Reviewed-on: https://code.wireshark.org/review/18705 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-08L2TP: Fix dissection when unknown vendor AVPAlexis La Goutte1-3/+3
Bug: 13103 Change-Id: I531aeb941bb80a1ac403d5e0ffcb6ba549ea9370 Reviewed-on: https://code.wireshark.org/review/18699 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>
2016-11-07cmake: avoid leading space in linker optionsMartin Kaiser1-3/+4
This causes problems with cmake 2.8.9, which ships with Debian Wheezy. Reorder the linker options to avoid a leading space. According to GNU ld's manual, the order of linker options on the command line does not matter. This should be the same for Visual Studio's cl.exe and for clang's linker. See https://www.wireshark.org/lists/wireshark-dev/201604/msg00141.html for more details about the problem. Change-Id: Ieaf7425600d394f365b01747747665233693fea2 Reviewed-on: https://code.wireshark.org/review/18581 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-11-07JSON: print field value for an item containing a subtreePascal Quantin1-18/+18
For fields that contain both a value and a subtree, print the value and then create a new item with a _tree suffix for the subtree content Bug: 13086 Change-Id: I5a3c96bf9895d87faff3925d439bb54b73769a3e Reviewed-on: https://code.wireshark.org/review/18663 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kacer <kacer.martin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-07L2TP: Fix typo on ERICSSON define valueAlexis La Goutte1-3/+3
Change-Id: I59b667d7415d340eddc48f648da594d2fac3ad93 Reviewed-on: https://code.wireshark.org/review/18700 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>
2016-11-07AUTHORS: Update record for Harald WelteHarald Welte1-0/+11
The record has become quite a bit out-of-date over the years. Change-Id: Id60e3e0839f27643227ddf79559769d228f17b0f Reviewed-on: https://code.wireshark.org/review/18687 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-07PROFINET: Update preliminary version of the Reporting System (RS) dissection.Birol Capa1-17/+72
Timestamp decoding is added. Name of "Stop Observer" is changed as "Observer Status Observer". TimeStatusObserver padding bytes location is changed. Text of RS_ReasonCode for value "0" is changed from "Reserved" to "No Detail". Change-Id: I2c231d75001a89a1e41f2518f5c6ca1fdf49a2f0 Reviewed-on: https://code.wireshark.org/review/18662 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>
2016-11-07interface_tree_model.cpp - ensure QObject namespace for tr()Michael Mann1-1/+1
Change-Id: I64214b5e2eb8b64ae36e049174d94d10da1e5bc5 Reviewed-on: https://code.wireshark.org/review/18698 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: Roland Knall <rknall@gmail.com>
2016-11-07gsm_abis_pgsl: Dissect PACCH uplink messagesHarald Welte1-0/+91
The P-GSL uplink PACCH messages contain information about the decoded access burst information four consecutive frame numbers. Each burst individually carries receive level, access burst type (8/11bit), validity information and access delay. Change-Id: I9d874d9b2c6de6a5461591e0f1f037ef2c34c143 Reviewed-on: https://code.wireshark.org/review/18682 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-07Include header to declare gsm_a_rr_rxlev_vals_ext.Guy Harris1-0/+1
Change-Id: Ie3fd593ef5ce90dc07037f44fda869c26616afd9 Reviewed-on: https://code.wireshark.org/review/18697 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-07Added Dissector for Openflow Experimenter Value field for Openflow 1.3 and 1.4sangodbole2-0/+20
Change-Id: I79d7b9afbde34451b545ac7e67c22b012843d822 Reviewed-on: https://code.wireshark.org/review/18654 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>
2016-11-07gsm_abis_pgsl: Decode dissection of codec_rxlevHarald Welte1-2/+2
Fix a copy+paste mistake (using the codec_csy string for the codec_rxlev) and use the existing val_str_ext for decoding the GSM/GPRS RxLev value into a dBm value range. Change-Id: Ie19621019977f6a41201cca424de3d44ece309b0 Reviewed-on: https://code.wireshark.org/review/18683 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-06Get rid of Boolean "flags" that don't have any bit set.Guy Harris3-28/+17
And tweak the Pidl generator for Wireshark not to generate "flags" like that. (The generator also does field name and true/false strings' case differently, so I didn't use it to regenerate the dissectors; that needs to be looked at.) Change-Id: Ie1657a782ebdb107e58792cedd29bbaa79b17bd4 Reviewed-on: https://code.wireshark.org/review/18695 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-06Use guint rather than gsize, to avoid 64-bit-to-32-bit shortening warnings.Guy Harris1-13/+13
Change-Id: Id907cd8c8ea83730674a0bc9b0636d2408b6546c Reviewed-on: https://code.wireshark.org/review/18694 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-06gsm_abis_pgsl: Fix endianness of frame numbersHarald Welte1-3/+3
The frame numbers are stored as 24bit value in little endian byte order, not in big endian (as assumed so far). Change-Id: Ia58db03749375a025e7b3b6b5805687af7601d9a Reviewed-on: https://code.wireshark.org/review/18681 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-06gsm_abis_pgsl: Hand off into GPRS RLC/MAC dissectorHarald Welte1-9/+220
Rather than displaying the P-GSL data as "data", let's call the proper GPRS RLC/MAC dissector to get a decode of the payload. As the RLC/MAC payload of P-GSL is one un-aligned stream of bits containing the EGPRS header + RLC data blocks, we need to re-aling the data blocks before calling into the RLC/MAC dissector in case of EGRPS. Change-Id: Ib081606c1b7af2a15ecf3c5f5b3ff44b5096e865 Reviewed-on: https://code.wireshark.org/review/18483 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>
2016-11-06gsm_abis_pgsl: Dissect Uplink Channel Mode Information ElementHarald Welte1-1/+9
Change-Id: Ibfd490fbdbdb479f0e557be9c0d3ede6f94c5639 Reviewed-on: https://code.wireshark.org/review/18685 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-06gsm_abis_pgsl: Proper interpretation of "Q bits"Harald Welte1-3/+8
Regarding the EGPRS header, a value of '1' means bads checksum/quality, and '0' means good quality/checksum. Let's explicitly state this by overriding the default True/False boolean labels with Bad/Good. Change-Id: I2168771d5552345c9c2eb6910f2839013da8210e Reviewed-on: https://code.wireshark.org/review/18684 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-06[Automatic update for 2016-11-06]Gerald Combs13-675/+1022
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia867e3b78363ba806ab99dd8da321f5f48c279cc Reviewed-on: https://code.wireshark.org/review/18691 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-06TCAP: Use a real dissector table to store dissector handles.Michael Mann4-71/+27
Also cleanup ANSI TCAP dissector that had a commented out attempt at what was just cleaned up with TCAP. Change-Id: I347f11e21a493d8d444c2dc528bb7713a227381a Reviewed-on: https://code.wireshark.org/review/18129 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-06Add wlan_radio preference to assume 802.11 preamble is short for durationSimon Barber1-1/+15
calculations. Change-Id: Ie314f7caee067b16da8dcb2a45cb1395ce0cb266 Reviewed-on: https://code.wireshark.org/review/17719 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-06gsm_abis_pgsl: Fix dissection of PGSL-STATUS-INDHarald Welte1-1/+2
The frame number is (as in all messages) three bytes long, not just one byte. Change-Id: I461121d61d2515f51462a3df1086ab988e4afab5 Reviewed-on: https://code.wireshark.org/review/18686 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-06lua: Added new integer sizes in TvbRangeFranklin "Snaipe" Mathieu2-7/+63
* Added support for 3-byte integers in :int() and :le_int() * Added support for 5, 6, and 7-byte integers in :int64() and :le_int64() Change-Id: If9ab4ea806191bc63effe45a081b9c65693c2367 Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io> Reviewed-on: https://code.wireshark.org/review/18672 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>
2016-11-06E.212: fix identification of PLMNs with 3 digits MNC ending with a 0Pascal Quantin3-1565/+1589
Split PLMNs arrays in 2 so as to clearly konw if the MNC is 2 or 3 digits long Bug: 13092 Change-Id: Ic5f776f3c1e5141f8739bf2137ebd046f7e4a0d6 Reviewed-on: https://code.wireshark.org/review/18679 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-06Qt: move declaration inside ifdef.Dario Lombardo1-1/+1
Variable col is unused if compiled without extcap. Change-Id: Iffc4951d4655e2649ecf350eefb09988370277e6 Reviewed-on: https://code.wireshark.org/review/18680 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-056LoWPAN: Use correct full nameStig Bjørlykke1-1/+1
6LoWPAN is not only used over IEEE 802.15.4, so adjust the full name. Change-Id: I56305baa74c0cc9337dfd5e813965035fd7dcec6 Reviewed-on: https://code.wireshark.org/review/18677 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-11-05travis: remove matrix steps from osxDario Lombardo1-0/+4
Change-Id: I172854246fea1858a622178177ca1524f7b4946f Reviewed-on: https://code.wireshark.org/review/18671 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-05travis: move osx first.Dario Lombardo1-1/+1
Change-Id: I08f65a6b5bcc78c4a74ed9f1488bca07cc6a1fd5 Reviewed-on: https://code.wireshark.org/review/18670 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-04bthci_acl: Always show data itemStig Bjørlykke1-4/+13
Always add the Data (Fragment) item, also for the last frame. Also add link to "Reassembled in #" for all except the last frame. The reassembly logic should be rewritten to use reassemble.h functions to be able to show the fragments frame list, fragment count and reassembled length items. Change-Id: Ib0e17711e182178d0b7ea0fd6903a9144adb757d Reviewed-on: https://code.wireshark.org/review/18659 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>