aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-03-26CMake: Add an rpm-package target.Gerald Combs7-31/+671
Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26BSSGP: Add 2 new values to 11.3.112 Redirection Indication.AndersBroman1-1/+3
Bug: 14570 Change-Id: Ia2d8323a89ed4b59f5c7167a51ea18017faf5408 Reviewed-on: https://code.wireshark.org/review/26653 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-26add support for Nano bootstrap protocol (TCP)Roland Haenel1-44/+554
Change-Id: Id63c70c05671ad637306809cd6254e951b6b5cd0 Reviewed-on: https://code.wireshark.org/review/26498 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2018-03-26dcerpc-pn-io (profinet): Fix Dead Store (Dead assignement/Dead increment) ↵Alexis La Goutte1-1/+0
Warning found by Clang Change-Id: I8dd3fe09d7b5d3132814e3531314220f600746ba Reviewed-on: https://code.wireshark.org/review/26649 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26ieee80211: Add back the ability to select on PLMN total values.Richard Sharpe1-3/+12
In previous versions of Wirkshark it was possible to filter on the PLMN value in total because the sub-fields were not broken out. This restores that capability for those who depended on it (WFA, I'm looking at you.) That is, a filter like: wlan.fixed.anqp.3gpp_cellular_info.plmn_info == 0x206013 would work but it does not currently work. This restores that filter. Change-Id: I2eb6eb7f47fb0246effaea0412a3d6ffcbcd61aa Reviewed-on: https://code.wireshark.org/review/26645 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26f5ethtrailer: fix memleak and fix tap registrationPeter Wu1-16/+53
On startup, not all protocols are ready. In particular, the ip, ipv6 and tcp tap registrations failed (and the error messages were leaked). Fix this by performing this registration when a capture file is loaded. Change-Id: Idd0634e395d484bae67b343ea23a84d440c4f4bc Reviewed-on: https://code.wireshark.org/review/26641 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26Qt: TCP Stream Graphs dialog updates.Gerald Combs7-22/+107
Add duplicate ACK ticks to Statistics → TCP Stream Graphs → Time Sequence (tcptrace), which I missed when porting from GTK+. Add zero window crosses while we're here. Switch TCPStreamDialog to a subclass of GeometryStateDialog. Add a slot and URL for the Help button and a stub entry in the User's Guide. Bug: 12009 Change-Id: Idf2ddb9eb33d924d65998285b5cffc234156497c Reviewed-on: https://code.wireshark.org/review/26592 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26mmdbresolve is an executable; git should ignore it.Guy Harris1-0/+1
Change-Id: I025c7c482182fdfa0849306f50d118d389670c83 Reviewed-on: https://code.wireshark.org/review/26646 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-26Fix more FT_UINT64s with value_strings.Guy Harris1-4/+4
Bug: 14565 Change-Id: I6cdd160f91637a8bed8c9b959d324ced65e5bea6 Reviewed-on: https://code.wireshark.org/review/26644 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-25Clean up REPORT_DISSECTOR_BUG().Guy Harris11-180/+173
Have it take a format and argument list as arguments, and have the formatting done inside the reporting code. That way, we're not relying on any particular wmem scope working. If WIRESHARK_ABORT_ON_DISSECTOR_BUG is set, try to add the message to the crash information (currently only supported in macOS), and print it to the standard error, before crashing. We won't necessarily have a usable crash dump to analyze, so we can't rely on that to find the cause of the crash. Ping-Bug: 14490 Change-Id: I2b39169c45c84f2ada31efa1d413bd28c140f8f4 Reviewed-on: https://code.wireshark.org/review/26643 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-25Fix whitespace.Guy Harris1-9/+9
Change-Id: I565969aa18628a635c2471da56c43cf2689c44d5 Reviewed-on: https://code.wireshark.org/review/26640 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-25Give a better error message.Guy Harris1-1/+3
DISSECTOR_ASSERT_NOT_REACHED() doesn't say *why* the code in question was reached; it's better to give a more explicit error message. Change-Id: I88b930e5a90ba8692aeac6ee29fa8fda21b5067b Reviewed-on: https://code.wireshark.org/review/26639 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-25There's no register.h file in the top-level source directory.Guy Harris1-1/+1
Change-Id: I021cdd102356954a9542455b432652842c9716f7 Reviewed-on: https://code.wireshark.org/review/26638 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-25README.dissector: update info about tvb_get_nstringzTadeusz Struk1-5/+9
Update invalid description for tvb_get_nstringz() and tvb_get_nstringz0(). Change-Id: I03483bc1a2aa5a701b44cd895b91289716ef215d Reviewed-on: https://code.wireshark.org/review/26598 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-25protobuf: allow config of UDP portsMartin Mathieson1-1/+3
Make it easier to check if traffic over UDP ports is protobuf-based. Change-Id: Ib88c4a7a6d2996f53249da6707f35e06b38c7b2d Reviewed-on: https://code.wireshark.org/review/26625 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-25ieee80211: use 64bit value string for a 64bit hf variableMartin Kaiser1-3/+3
Using a 32bit value string triggers the assertion in hf_try_val64_to_str(). Bug: 14560 Change-Id: Ief3f46ee60355f43d2fb5f210608fde21be8d41d Reviewed-on: https://code.wireshark.org/review/26633 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-25Bluetooth HCI evt: dissect last remaining BT5 eventsAllan Møller Madsen1-25/+324
Add dissection of events: LE Periodic Advertising Sync Established LE Periodic Advertising Report LE Periodic Advertising Sync Lost LE Advertising Set Terminated LE Scan Request Received LE Channel Selection Algorithm SAM Status Change Add missing extended LMP feature bits Change-Id: I6aed69ff70674950507a7f4730f4136077c00357 Signed-off-by: Allan Møller Madsen <almomadk@gmail.com> Reviewed-on: https://code.wireshark.org/review/26631 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-25[Automatic update for 2018-03-25]Gerald Combs10-115/+193
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie7d9f2b00222e5ed4e05b5c3fc9100ad26e65084 Reviewed-on: https://code.wireshark.org/review/26635 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-25RPCRDMA: Fix 'might be clobbered' warningUli Heilmeier1-1/+1
Fix "might be clobbered by 'longjmp' or 'vfork' warning Change-Id: I3c7433568c452782316e37efd9697effdf0ebe0f Reviewed-on: https://code.wireshark.org/review/26632 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-03-25Update my emailMichał Łabędzki3-2/+3
Old e-mail does not exist right now, but I am still here. Change-Id: I8436bf340e2f4a1948674a686fea32dee0fe91f6 Reviewed-on: https://code.wireshark.org/review/26627 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-25Bluetooth: ATT: Appearance: Add new itemsMichał Łabędzki1-0/+51
Items: Personal Mobility Device Continuous Glucose Monitor Insulin Pump Medication Delivery Change-Id: If0e706506164883b34550a6c6865095c4dd1e816 Reviewed-on: https://code.wireshark.org/review/26626 Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-25In some dialogs, have *no* auto-default buttons on macOS.Guy Harris2-2/+53
In macOS dialogs, there's a default button, which is the button that Enter/Return activates, and that Enter/Return *always* activates, *regardless* of what button has the input focus. To activate the button that has the input focus, you use the space bar. To implement that, we need to disable auto-default on all buttons, including the Cancel button. Put in a comment explaining all this. We may want to do this in all alert boxes, and possibly all dialogs with buttons. Change-Id: I214dd2870a9720ea705d8db39adc5b6af2003fb1 Reviewed-on: https://code.wireshark.org/review/26629 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-24RPC-over-RDMA: add explicit fall through comments to please gcc 7.2.0Pascal Quantin1-0/+4
Change-Id: Ied55b2283da36dabd21768660f6824492cd569a1 Reviewed-on: https://code.wireshark.org/review/26624 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-24wslua: Fix loggingPeter Wu2-2/+3
Always display Lua messages (to match tshark), do not send them to qDebug as they will not be visible with the default log options. Change-Id: I660a3877355891d45881b26735596ea6dc8a8b29 Fixes: v2.5.0rc0-2037-gc9b6887d84 ("wslua: Fix logger after g6a5e90f2") Reviewed-on: https://code.wireshark.org/review/26599 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24RPC-over-RDMA: add reassembly for reply, read and write chunksJorge Mora5-35/+1122
The RDMA reply chunk is used for a large RPC reply which does not fit into a single SEND operation and does not have a single large opaque, e.g., NFS READDIR. The RPC call packet is used only to set up the RDMA reply chunk. The whole RPC reply is transferred via RDMA writes. Fragments are added on any RDMA write packet, RDMA_WRITE_ONLY, RDMA_WRITE_FIRST, etc., and the reassembly is done on the reply message. The RPC reply packet has no data (RDMA_NOMSG) but fragments are reassembled and the whole RPC reply is dissected. The RDMA read chunk list is used for a large RPC call which has at least one large opaque, e.g., NFS WRITE. The RPC call packet is used only to set up the RDMA read chunk list. It also has the reduced message data which includes the first fragment (XDR data up to and including the opaque length), but it could also have fragments between each read chunk and the last fragment after the last read chunk data. The reduced message is then broken down into fragments and inserted into the reassembly table. Since the RDMA read chunk list is set up in the RPC call then do not dissect the upper layer in this case and just label rest of packet as "Data" since the reassembly will be done on the last read response. The protocol gives the XDR position where each chunk must be inserted into the XDR stream thus as long as the maximum I/O size is known it is possible to know exactly where to insert these fragments. This maximum I/O size is set on the first READ_RESPONSE_FIRST or READ_RESPONSE_MIDDLE but in case where any of these packets have not been seen then a value of 100 is used (real value should be at least 1024) but in this case the message numbers are not consecutive between chunks but since the total size of all chunks is verified to make sure there is a complete message to reassemble then all fragments should be in the correct order. Fragments are added on any RDMA read packet: RDMA_READ_RESPONSE_ONLY, RDMA_READ_RESPONSE_FIRST, etc., and the reassembly is done on the last read response. Since there could be multiple chunks and each chunk could have multiple segments then the total size must be checked to complete the reassembly because in this case there will be multiple READ_RESPONSE_LAST. The RDMA write chunk list is used for a large RPC reply which has at least one large opaque, e.g., NFS READ. The RPC call packet is used only to set up the RDMA write chunk list. The opaque data is then transferred via RDMA writes and then the RPC reply packet is sent from the server. The RPC reply packet has the reduced message data which includes the first fragment (XDR data up to and including the opaque length), but it could also have fragments between each write chunk and the last fragment after the last write chunk data. The reduced message is then broken down into fragments and inserted into the reassembly table. Since the RPC reply is sent after all the RDMA writes then the fragments from these writes must be inserted in the correct order: the first RDMA write fragment is inserted with message number 1, since the first fragment (message number 0) will come from the very last packet (the RPC reply with RDMA_MSG). Also, the last packet could have fragments which must be inserted in between chunk data, therefore message numbers from one chunk to another are not consecutive. In contrast with the RDMA read chunk list, the protocol does not allow an XDR position in the RDMA write chunks, since the RPC client knows exactly where to insert the chunk's data because of the virtual address of the DDP (direct data placement) item. There is no way to map a virtual address with an XDR position, thus in order to reassemble the XDR stream a two pass approach is used. In the first pass (visited = 0), all RDMA writes are inserted as fragments leaving a gap in between each chunk. Then the dissector for the upper layer is called with a flag letting the dissector know that it is dealing with a reduced message so all DDP enabled operations handle the opaque data as having only the size of the opaque but not the data and reporting back the offset from the end of the message. Once the upper layer dissector returns, this layer now has a list of DDP eligible item's offsets which are then translated into XDR offsets and then the RPC reply packet is broken into fragments and inserted in the right places as in the case for the RDMA read chunk list. On the second pass (visited = 1), all fragments have already been inserted into the reassembly table so it just needs to reassembled the whole message and then call the upper layer dissector. RFC 8267 specifies the upper layer bindings to RPC-over-RDMA version 1 for NFS. Since RPC-over-RDMA version 1 specifies the XDR position for the read chunks then only the write chunk DDP eligible items are handled in the upper layer, in this case the NFS layer. These are the only procedures or operations eligible for write chunks: * The opaque data result in the NFS READ procedure or operation * The pathname or linkdata result in the NFS READLINK procedure or operation Two functions are defined to signal and report back the DDP eligible item's offset to be used by the upper layers. Function rpcrdma_is_reduced() is used to signal the upper layer that it is dealing with a reduced data message and thus should ignore DDP eligible item's opaque processing and just report back the offset where the opaque data should be. This reporting is done using the second function rpcrdma_insert_offset(). Reassembly is done for InfiniBand only. Reassemble fragments using the packet sequence number (PSN) of each RDMA I/O fragment to make sure the message is reassembled correctly when fragments are sent out of order. Also a unique message id is used for each message so fragments are reassembled correctly when fragments of different messages are sent in parallel. The reassembled message could be composed of multiple chunks and each chunk in turn could be composed of multiple segments in which each segment could be composed of multiple requests and of course each request is composed of one or more fragments. Thus in order to have all fragments for each segment belonging to the same message, a list of segments is created and all segments belonging to the same message are initialized with the same message id. These segments are initialized and added to the list on the call side on RDMA_MSG by calling process_rdma_lists. Bug: 13260 Change-Id: Icf57d7c46c3ba1de5d019265eb151a81d6019dfd Reviewed-on: https://code.wireshark.org/review/24613 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24packet-mq: Fix for Encoding problem in some MQ StructRobert Grange1-2/+6
Fix to use the MD encoding info when decoding some MQ Struct Change-Id: I0de05efeff41df893b82ac36ad28cfa04c68b1e0 Reviewed-on: https://code.wireshark.org/review/26510 Reviewed-by: Robert Grange <robionekenobi@bluewin.ch> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24OID name resolv: Fix MIB/PIB path presentationsJaap Keuter4-19/+29
oids.c: Sort out libsmi init, add user paths once. Qt, About WS: Stop memory leak of MIB/PIB paths. GTK, About WS: Allow for 20 individual paths. tshark, folders: init before getting paths, allow 20 individual. Bug: 14539 Change-Id: I113ee2dd4394d553a16b256e66fd840eeeec78ef Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/26555 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24Couchbase: update opcodes and decode AUDIT_PUT as JSONSergey Avseyev1-10/+45
Change-Id: I6b9e3455abbf0cbd4eb6513fc652cf2902c9eb79 Reviewed-on: https://code.wireshark.org/review/26570 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24Update a comment.Guy Harris1-1/+8
Change-Id: I9a1f5ed85591202c52f26d4b3d63d8beb7578e15 Reviewed-on: https://code.wireshark.org/review/26623 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-24Fix a comment.Guy Harris1-2/+3
We already *have* an exported dissector that always dissects PPP without HDLC-like framing; the question is whether we should have one that always dissects PPP with HDLC-like framing (with a check for the HDLC-like framing, in case, for example, it was negotiated away), but doesn't check for Cisco HDLC. Change-Id: I3b3319dd29c7516220b82df626bc6ac520ea0dd9 Reviewed-on: https://code.wireshark.org/review/26622 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-24Hand off to the PPC-in-HDLC-like-framing dissector.Guy Harris1-3/+3
There might be HDLC-like framing inside SSTP, even if it eventually gets negotiated away. Bug: 14559 Change-Id: Ibc254f221f26c0da905ceff4edff7859a3fec635 Reviewed-on: https://code.wireshark.org/review/26619 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-24Don't rely on "xxx *yyy[N] = {};" compiling.Guy Harris1-28/+19
At least as I read C90 "6.5.7 Initialization" and C99 "6.7.8 Initialization", there must be at least one "initializer" in an "initializer-list", so nothing requires that the compiler accept, for example static const ws_mem_usage_t *memory_components[MAX_COMPONENTS] = { }; Bug: 14556 Change-Id: Ief1dbfee504ad5ef1d984390dc2da18deba7fb90 Reviewed-on: https://code.wireshark.org/review/26616 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23Include alloca.h if we have it.Guy Harris4-3/+38
Bug: 14552 Change-Id: I799691f7f33ca56748ed4e51d7d548f37769837b Reviewed-on: https://code.wireshark.org/review/26611 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23Qt: Remove a redundant include.Gerald Combs1-1/+0
Change-Id: I0f5e4227bebc98678344b28e835e1c7b26b57502 Reviewed-on: https://code.wireshark.org/review/26607 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-23Qt: ensure that taps are invoked on reload/rescanPeter Wu1-1/+2
Invoke the tap draw callback immediately after reloading a capture (or changing a display filter) rather than waiting for a timer to expire. Change-Id: I3d1549d1a18c8e173cd29d45f31ce7586e0d70fe Reviewed-on: https://code.wireshark.org/review/26600 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-23docs: improve Lua Listener examplePeter Wu1-1/+4
Ensure the dialog is populated when the dialog is opened after a capture file has already been loaded. Change-Id: I9ba1b4a1eb7a8b21ce7dac4a820eadf10daa9845 Reviewed-on: https://code.wireshark.org/review/26601 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-23packet-ieee80211.c: Fix runtime warning "field wlan.trigger.he.common_info ↵Joerg Mayer1-1/+1
is not of type FT_CHAR or an FT_{U}INTn type" Change-Id: I4796abc440f386e4326067dff825486dedb9d07b Reviewed-on: https://code.wireshark.org/review/26597 Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-23Update a comment.Guy Harris1-2/+10
Change-Id: Id5fc4ca97212c5d4c91ff89806b9e6b826114b17 Reviewed-on: https://code.wireshark.org/review/26608 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23Use $(INSTALL_DATA) rather than $(INSTALL) -m 644.Guy Harris1-6/+6
Change-Id: Ic9a867dad615f9d7ed8f8f22eb47ee24e57d5130 Ping-Bug: 14555 Reviewed-on: https://code.wireshark.org/review/26606 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23Add -Wp,-H200000 with HP's C compiler.Guy Harris1-3/+7
Bug: 14554 Change-Id: Ieef015daf852049744a5dd9d3d0dfd566f3ce8fc Reviewed-on: https://code.wireshark.org/review/26603 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23Skip hidden columns when we export packets.Gerald Combs1-2/+11
Skip hidden columns when we export to CSV, EK, and PSML. Change-Id: Id1dc0f4d3cf34e74ce52893d0f0a30f4b4d61aed Reviewed-on: https://code.wireshark.org/review/26588 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-22mac-nr: Minor changesMartin Mathieson1-2/+28
Minor display issues, and show in context tree 2 recently-introduced fields. Change-Id: I14ecde0059d17abd17767d4d0c34ba093fa1987f Reviewed-on: https://code.wireshark.org/review/26596 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-22Don't crash for ERSPAN packets in Linux cooked captures.Guy Harris2-3/+22
Sadly, "cooked" means the GRE header isn't available; the extra data pointer is null, so we can't dereference it. Bug: 14548 Change-Id: I51ae67dcc144b7f5ab3c82dd9adf09b342b29ced Reviewed-on: https://code.wireshark.org/review/26595 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-22Add Arista Vendor Specific Protocol (Ethertype) dissectorNikhil AP6-0/+232
Bug: 14550 Change-Id: I08d54825eb054255167eb28469b7fb854507e4ed Reviewed-on: https://code.wireshark.org/review/26492 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22NR-RRC: remove a redundant declarationPascal Quantin3-16/+6
Change-Id: Iddc49443ea4534314ef39bae749ddafb135143ff Reviewed-on: https://code.wireshark.org/review/26591 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-22mac-nr: fix some wrongly named field namesMartin Mathieson1-42/+42
Fix some wrongly named fields names related to multiple entry PHRs. Change-Id: I87b8b53ddfb86255d4840a73cdf4e570b7f9b9f0 Reviewed-on: https://code.wireshark.org/review/26590 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-22nr-mac: Add Multiple Entry PHR CE to nr-macMartin Mathieson2-9/+315
This will likely change in the future as we: - add support for 32-bits of flags for when there are higher SCellIndex - possibly add different filters for each type of ph measurement - possibly add separate filters for the pcmax_c fields Change-Id: Icb9b242910a41b1b9e448ae2cd1dbd54a418fd36 Reviewed-on: https://code.wireshark.org/review/26507 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-22ZigBee ZCL Occupancy Sensing: remove unused defines and value_stringPascal Quantin1-11/+0
Change-Id: Ifa5209fb0c64034eb85356d1bc336487ff43a9c2 Reviewed-on: https://code.wireshark.org/review/26589 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-22PROFINET: Am_location dissection was wrong byte order.Gizem Yurdagul1-48/+96
Dissection is updated according to spec. Unnecessary tab and spaces are removed. Change-Id: Ia9b3252f5e9dcdc3617286a802fffeef250888c2 Reviewed-on: https://code.wireshark.org/review/26542 Reviewed-by: Birol Capa <birol.capa@siemens.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22Update and extend the ZigBee ZCL color control cluster.Paul Zander1-160/+954
Change-Id: Ife7c15797e2167acf248a09718fe2ad87ec638e7 Reviewed-on: https://code.wireshark.org/review/26552 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>