aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-07WiX: Switch to Visual Studio 2015.Gerald Combs2-4/+4
The Windows builders now use Visual Studio 2015. Change-Id: I0fe4defd090930a0b8531e544d03ad4f3b36dac1 Reviewed-on: https://code.wireshark.org/review/22018 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 316d09a5aee68904ba0348c2017647b4dea3aab1) Reviewed-on: https://code.wireshark.org/review/22019
2017-06-07epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-0/+4
Change-Id: Id5dde66c6473cd7ba3c7cc981d7b86f564f7ca9f Reviewed-on: https://code.wireshark.org/review/22004 Reviewed-by: Ahmad Fatoum <ahmad@a3f.at> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-07FP: Comments fixesDarien Spencer1-6/+5
Minor comments changes Change-Id: I71fb37ee20cf10b03beb5c805c5e63aed016d8ab Reviewed-on: https://code.wireshark.org/review/22010 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-07epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+4
Change-Id: Id8e5c3622f5186fcab530b9d329a0ff1d42bd6f3 Reviewed-on: https://code.wireshark.org/review/22002 Reviewed-by: Ahmad Fatoum <ahmad@a3f.at> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-07rsl: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+0
Change-Id: I0ab6056a5241c53dba8b569905e29a9ab9d9f265 Reviewed-on: https://code.wireshark.org/review/22001 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Piotr Tulpan <piotr.tulpan@netscan.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-07RANAP: prevent heuristic dissector from adding info to tree or triggering ↵Pascal Quantin2-15/+33
exception Bug: 13770 Change-Id: I6ba5dfb5098ea1a4d4d1e2d740382326c7d58f8c Reviewed-on: https://code.wireshark.org/review/22006 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Ivan Nardi <nardi.ivan@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-07CoAP: added new TLV code 11542 according to changes in LwM2M OMA Spec.Anton Butenko1-0/+1
Bug: 13761 Change-Id: I3cd5bca6e6959aeb74bf3ae8141c3b2afa70e028 Reviewed-on: https://code.wireshark.org/review/21999 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>
2017-06-07Qt: Wireless Timeline improvementsStig Bjørlykke2-15/+17
- Change keyboard shortcuts to Ctrl+Shift+[IOU] - Use UTF8_MICRO_SIGN in tooltip text - Change 0xffffffffffffffff with G_MAXUINT64 - Check for valid wlan_radio *ri before use - Small whitespace cleanups Change-Id: I9fa85c0d675ef3837510afaf5f1b723d89ac134c Ping-Bug: 13769 Reviewed-on: https://code.wireshark.org/review/21993 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Simon Barber <simon.barber@meraki.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-07MIP: Add decoding of Mobile Network Extensions (RFC5177)Marius Paliga1-1/+77
Change-Id: Ia657e7ad5c8d507aeec74ce815568e6e44137d70 Reviewed-on: https://code.wireshark.org/review/21975 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-07umts_fp: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+0
Change-Id: Iae6425704cdd72476bcadf9912564dc162684ef5 Reviewed-on: https://code.wireshark.org/review/22000 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-07CQL: add an expert info when a list count is negativePascal Quantin1-17/+41
Bug: 13764 Change-Id: Ied78911c7089c9b7ca50d4df0e478cd4946af372 Reviewed-on: https://code.wireshark.org/review/21988 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Benoît Canet <benoit@scylladb.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-07ieee80211: Explain TSF in wlan_radio.timestamp blurbStig Bjørlykke1-4/+4
Also exchange 0xFFFFFFFFFFFFFFFF with G_MAXUINT64. Change-Id: Ie9ecca6268afc1788ce79015295b706350490476 Reviewed-on: https://code.wireshark.org/review/21990 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-07profinet: use proto_tree_add_item_ret_(u)int directlyMartin Kaiser5-43/+26
Profinet defined functions to add 32bit integers to the tree and get their value. This is equivalent to proto_tree_add_item_ret_(u)int. Call those functions directly and remove the now obsolete Profinet functions. In some cases, the returned 32bit value is discarded. Use proto_tree_add_item then. Change-Id: I7744fab2f27b8ae8e681a36e4e96eb2f8be87bd6 Reviewed-on: https://code.wireshark.org/review/21989 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> 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>
2017-06-06[Ranap] Heuristic: update to the current highest ProcedureCode idIvan Nardi3-2/+3
Change-Id: Ib17b5db42717d92dfd139d56b947166fddc29c5b Reviewed-on: https://code.wireshark.org/review/21986 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>
2017-06-06profinet: use proto_tree_add_item_ret_(u)intMartin Kaiser1-12/+4
profinet has a number of internal functions that add an item to the tree and read its value. For 32bit integers, this is exactly what proto_tree_add_item_ret_(u)int do. Just call those functions. (We could do the same for 8 and 16bit values. We'd need a temporary value then and the code wouldn't be much easier than it is now.) Change-Id: I98fc70ced2dc5a552235a476d40a4275f3b3bd38 Reviewed-on: https://code.wireshark.org/review/21965 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-06-06epl: fix code will never be executed [-Wunreachable-code]Alexis La Goutte1-3/+3
false positive when declare variable after a switch(){ Change-Id: Ief4770b2200a356b061cf84c7828c8ebe76a1fbb Reviewed-on: https://code.wireshark.org/review/21983 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>
2017-06-06epl: fix no previous prototype for function 'profile_load' ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: I5c3119436984cc7de3dcf4dffd1961481cacc553 Reviewed-on: https://code.wireshark.org/review/21982 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-06netflow/cflow: fix hf conflictAlexis La Goutte1-1/+1
'cflow.pie.ntop.retransmitted_out_bytes' exists multiple times with NOT compatible types: FT_IPv6 and FT_UINT32 Change-Id: I9caed4c28a5e8322008b4cae4f625a681343a136 Reviewed-on: https://code.wireshark.org/review/21984 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>
2017-06-06FP - Resolve U-RNTI for HS-DSCH & E-DCHDarien Spencer1-20/+26
Use U-RNTI resolving logic applied to DCH for HS-DSCH and E-DCH as well. Change-Id: I1b2b6f6d4c7e2a46fb8208b7134aa62e86512938 Reviewed-on: https://code.wireshark.org/review/21977 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-06FP - Fix missing TFI bitmaskDarien Spencer1-4/+2
Parsing of the TFI field was not ignoring the 3 leftmost bits. Also updated the comment explaining his mask. Change-Id: I98d6ab9bdec3ce4a8640ece560a467ddbd5b8d42 Reviewed-on: https://code.wireshark.org/review/21978 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-06epl (profiler-parser): fix parameter 'cmp/allocator' not found in the ↵Alexis La Goutte1-2/+2
function declaration [-Wdocumentation] Change-Id: I76a7c66fd4d1872b5cc63447b5acfac2ab8821fd Reviewed-on: https://code.wireshark.org/review/21981 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-06rsa.h: include <stdio.h>Michael Mann1-0/+1
Pacify OS/X buildbot Change-Id: Icbf49b747473adfa16c1a08c81489b68a88d9a93 Reviewed-on: https://code.wireshark.org/review/21979 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-06FP - Added "Missing PI bitmap" warningDarien Spencer1-21/+35
Added an expert field warning the user if a PI bitmap was not found for a PCH frame. Change-Id: Id9d0461f6528b767da0058eba844617e5bbb1d6e Reviewed-on: https://code.wireshark.org/review/21972 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>
2017-06-06ssl-utils: Build with -Wshorten-64-to-32Stig Bjørlykke1-2/+2
[...]/wireshark/epan/dissectors/packet-ssl-utils.c:3556:7: error: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'gint' (aka 'int') [-Werror,-Wshorten-64-to-32] i=rsa_decrypt_inplace(encrypted_pre_master->data_len, ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I1bfdef1bfa451f5098bc6c12c1b4cc57c7de4fdd Reviewed-on: https://code.wireshark.org/review/21976 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>
2017-06-05Cleanup DRDA dissectorMichael Mann1-92/+54
1. Call "main" dissector from heuristic dissector so tcp_dissect_pdus can be used. 2. Let tcp_dissect_pdus do its job and be the "loop logic" 3. Column API simplification 4. Use proto_tree_add_item_ret_uint Change-Id: Ic53fd6b20daa8153cdf22f8aadf53dbdd24334bf Reviewed-on: https://code.wireshark.org/review/21958 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-05Move RSA key loading and decryption functions to wsutilAhmad Fatoum10-413/+520
Loading PEM and PKCS#11 keys was being done in static functions in packet-ssl-utils.c. These were moved to wsutil, with prototypes in a new <wsutil/rsa.h> header. This adds gnutls as optional dependency to wsutil. The RSA decryption helper was also moved and is now provided in <wsutil/wsgcrypt.h>. This allows more dissectors to access this functionality. Change-Id: I6cfbbf5203f2881c82bad721747834ccd76e2033 Reviewed-on: https://code.wireshark.org/review/21941 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: Michael Mann <mmann78@netscape.net>
2017-06-05FP - Code clean up and comments updatesDarien Spencer1-49/+14
* Removed some commented code * Removed unused #if 0'd code * Update some comments * Fixed an indentation issue Change-Id: I807bb279a1df00bf49bdb5d6ce63ba1a55032d78 Reviewed-on: https://code.wireshark.org/review/21970 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-05Qt: Build wireless_timeline.cpp with -Wshorten-64-to-32Stig Bjørlykke1-1/+1
[...]/wireshark/ui/qt/wireless_timeline.cpp:190:50: error: implicit conversion loses integer precision: 'unsigned long' to 'guint' (aka 'unsigned int') [-Werror,-Wshorten-64-to-32] guint half_window = (end_tsf - start_tsf)/2; ~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~^~ Change-Id: I675408f8a6c0809588ce89b2b98e05d7bfb10ed9 Reviewed-on: https://code.wireshark.org/review/21969 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>
2017-06-05wsutil: Add XTEA block cipherAhmad Fatoum4-2/+115
XTEA is a 64-bit block Feistel cipher with a 128-bit key and a suggested 64 rounds. It's used by the MMORPG Tibia for encrypting game server traffic. Usual XTEA treats the blocks as big-endian. Tibia treats them as little endian, therefore both versions are provided. Change-Id: I9ad0c8e066f848b20772ce4e1d3df19deff307b8 Reviewed-on: https://code.wireshark.org/review/21942 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-05Revert "More 2.4 initialization."Gerald Combs1-1/+1
This reverts commit c60a6580c935c68d8bb82a84f0359b46b1bf06a5. Wrong branch. Change-Id: I846b26d09bf1ab99d3f42baf35f1a63f1dd806d2 Reviewed-on: https://code.wireshark.org/review/21967 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-05More 2.4 initialization.Gerald Combs1-1/+1
Change-Id: Iac4c02068eb462854b66c1561f4dfa2601bb18bf Reviewed-on: https://code.wireshark.org/review/21966 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-05asterix: add a link to the specificationsMartin Kaiser1-0/+8
It was pointed out during the discussions in https://code.wireshark.org/review/#/c/19568/ that the specifications are publicly available. Change-Id: Idc21a606c9b9aedb16f7632b24322c901e7db524 Reviewed-on: https://code.wireshark.org/review/21963 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-06-05[Bssmap] Fix and improve dissectionIvan Nardi1-6/+4
See TS 48.008: * in "Perform Location Request" msg, "Cell Identifier" ie is optional, not mandatory (3.2.1.71) * in "Uplink Releae Command" msg, "Cause" ie is mandatory (3.2.1.62) * fixed and improved "Service Handover" ie dissection (3.2.2.75) Change-Id: I2194bf56ef21a2cccbd4f2ed7ff22565af04cddd Reviewed-on: https://code.wireshark.org/review/21957 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>
2017-06-05Add a timeline view for packets, with the timing data used to generate the ↵Simon Barber13-26/+928
display taken from the timing analysis done in the wlan_radio dissector. QT only. The timeline background is light gray, white for packets displayed in the packetlist, and blue for the currently selected packet. Packets are coloured according to the colouring rules foreground colour. The timeline can be zoomed with controls on the toolbar. At higher zoom levels the duration (NAV) field is plotted as a horizontal line to the right of a packet. The height of a packet in the timeline is proportional to the RSSI. The bottom half of the packet is only shown if it matches the display filter. Todo: Auto detect TSF timing reference point (start/end of packet) Add a scrollbar Add a ruler showing time Improve handling of focus. Do not display NAV for packets with bad FCS. Show related packets graphically Different Y axis modes - bandwidth/channel use display - different transmitters per line - background color from coloring rules Live capture support Change-Id: Ic31fffb0d6854966361ade7abb5c0be50db9a247 Reviewed-on: https://code.wireshark.org/review/20043 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-05Allow bigger snapshot lengths for D-Bus captures.Guy Harris84-258/+322
Use WTAP_MAX_PACKET_SIZE_STANDARD, set to 256KB, for everything except for D-Bus captures. Use WTAP_MAX_PACKET_SIZE_DBUS, set to 128MB, for them, because that's the largest possible D-Bus message size. See https://bugs.freedesktop.org/show_bug.cgi?id=100220 for an example of the problems caused by limiting the snapshot length to 256KB for D-Bus. Have a snapshot length of 0 in a capture_file structure mean "there is no snapshot length for the file"; we don't need the has_snap field in that case, a value of 0 mean "no, we don't have a snapshot length". In dumpcap, start out with a pipe buffer size of 2KB, and grow it as necessary. When checking for a too-big packet from a pipe, check against the appropriate maximum - 128MB for DLT_DBUS, 256KB for everything else. Change-Id: Ib2ce7a0cf37b971fbc0318024fd011e18add8b20 Reviewed-on: https://code.wireshark.org/review/21952 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-05[TDS] Convert to using tcp_dissect_pdus.Michael Mann1-214/+72
Bring some modernity to this dissector and use tcp_dissect_pdus. Also an excuse to remove the conversation_set_dissector in the heuristic dissector which was generating some false positives because the heuristic isn't that strong. Bug: 12882 Change-Id: Ibb04fd4fbc819acd1dc96d6259b047c897ec2de6 Reviewed-on: https://code.wireshark.org/review/19125 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-05Remove "length only" check for dissectors that use tcp_dissect_pdus.Michael Mann5-21/+0
If a TCP segment is small enough, dissectors that have a only a length check determining if it's their packet or not before calling tcp_dissect_pdus will throw out packets that are probably destined for them. Change-Id: I78034307b56aa537943191a6887166577936a6a3 Reviewed-on: https://code.wireshark.org/review/21950 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-05Add DCE/RPC over TCP dissector to "force" DCE/RPC when heuristics failMichael Mann1-2/+19
Add a simple dissection function for DCE/RPC that just calls tcp_dissect_pdus and doesn't do any heuristics checks. This can be used to handle cases where TCP PDU is too small for DCE/RPC heuristics checks and user knows the data is DCE/RPC and can set it through Decode As. Bug: 6392 Change-Id: I9e4960282ea64d20499f7d5a330f48f30a092b30 Reviewed-on: https://code.wireshark.org/review/21951 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-04Allocate the pipe capture data buffer upfront.Guy Harris1-33/+32
We were allocating it every time we called cap_pipe_dispatch() (or, prior to I0256daae8478f1100fdde96a16a404465ec200b3, in capture_loop_dispatch()) and freeing it before the routine in question returned. However, we were treating that buffer as if it persisted from call to call, which worked *only* if freeing and re-allocating the buffer meant that we'd get back the same buffer with its previous contents intact. That is *not* guaranteed to work. Instead, allocate the buffer when we open the capture pipe, and free it when we close the capture pipe. Change-Id: Ic785b1f47b71b55aba426db3b1e868186c265263 Reviewed-on: https://code.wireshark.org/review/21948 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-04GSM A DTAP: fix detection of missing first mandatory elementPascal Quantin1-3/+4
Bug: 13760 Change-Id: I1c062420f96104a46e5d1478eb054f086f942b54 Reviewed-on: https://code.wireshark.org/review/21946 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>
2017-06-04[SGsAP] Fix Release-Request msgIvan Nardi1-1/+1
"SGs Cause" is an optional ie, not a mandatory one. See TS 29.118 8.23.1 Change-Id: I74ad90d159e667fa41f8c099520ce5f662a4d85e Reviewed-on: https://code.wireshark.org/review/21939 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>
2017-06-04profinet dcp: simplify dissect_PNDCP_Suboption_Manuf()Martin Kaiser1-9/+4
There's not much point in having a switch-case block with only a default statement ;-) Change-Id: Iaacd87bb2995783b98e5395b3654a1c8f32c473a Reviewed-on: https://code.wireshark.org/review/21938 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-04profinet dcp: don't THROW() an exception from a dissectorMartin Kaiser1-1/+5
In this case, we can simply replace the exception with an expert info and exit the loop. Change-Id: I232e554af299140d7123b5e21d78372a35a7923b Reviewed-on: https://code.wireshark.org/review/21936 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-04profinet: remove unnecessary if(tree) checksMartin Kaiser1-32/+15
Change-Id: I0c4346386846c03a67b83bebfce6da6323379180 Reviewed-on: https://code.wireshark.org/review/21937 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-04[Automatic update for 2017-06-04]Gerald Combs11-3456/+3773
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I95d3c8d0ce5c4215730d461f00812d48fd697892 Reviewed-on: https://code.wireshark.org/review/21932 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-04Allocate a buffer in cap_pipe_dispatch(), not in capture_loop_dispatch().Guy Harris1-7/+15
The buffer is only used when reading from a pipe; no need to allocate it when capturing from a pcap_t. Doing it in cap_pipe_dispatch() makes it clearer when the buffer exists and when it doesn't. Change-Id: I0256daae8478f1100fdde96a16a404465ec200b3 Reviewed-on: https://code.wireshark.org/review/21930 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-04Bugfix GTK Decode AsMichael Mann1-1/+1
Current layer number needs to be unconditionally saved after v2.3.0rc0-3740-ge1f84f985e, which increased the number of dissectors that use current layer number to determine Decode As value. Change-Id: Ib82370af94ea00613a337890369e228cffa1ed81 Reviewed-on: https://code.wireshark.org/review/21928 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-03capture-pcap-util.c: fix a typoPascal Quantin1-1/+1
Change-Id: I674d02be665afc331e266725c0a0cbc0a33d9403 Reviewed-on: https://code.wireshark.org/review/21926 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-03LoRaTap DLT and dissectorErik de Jong7-0/+261
Add support for handling LoRaTap (https://github.com/eriknl/LoRaTap) DLT in wiretap and add dissector for LoRaTap headers. Exposes Syncword for subdissectors to dissect frame payload. Change-Id: Ie4ba2189964376938f45eb3da93f2c3376042e85 Reviewed-on: https://code.wireshark.org/review/21915 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-03Clean Release NotesPascal Quantin1-67/+2
Change-Id: I5e13c057265c3435bf8104351306a26f264209bd Reviewed-on: https://code.wireshark.org/review/21923 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>