aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-10-02CMake: Add a systemd RPM check.Gerald Combs1-0/+3
Change-Id: Ib679994f5af129254865daad211913a6b068de12 Reviewed-on: https://code.wireshark.org/review/29968 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-10-02RDP: Changed some RDP info text to better indicate which packet typeÉmilio Gonzalez1-4/+6
we're dealing with. Change-Id: I2cafefbdbaf6a4235afbae41969ed53f9c2e24c2 Reviewed-on: https://code.wireshark.org/review/29961 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-01Add .idea/ and cmake-build-*/ to gitignore (for jetbrains IDEs)Émilio Gonzalez1-0/+2
Change-Id: I70d8203cfa0a0c14f4df65d3a4bc9d5a1fbf12ae Reviewed-on: https://code.wireshark.org/review/29959 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-10-01Fix handling of some ISDN calls.Guy Harris1-1/+17
There's no guarantee that there will be two digits after PRI-XMIT or PRI-RCV; the capture file in bug 3535, for exmaple, has "PRI-XMIT-0/1" and "PRI-RCV-0". Require a minimum of 1, not 2, non-{/(:} characters. Leave the maximum of 20 in place. Change-Id: Ie8f8f4ff5eb04baf0ee61bf28015e59a1fa43948 Reviewed-on: https://code.wireshark.org/review/29947 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-01pcapng: Fix a buffer length.Gerald Combs1-0/+1
In pcapng_read_systemd_journal_export_block, increase our buffer length before appending to it. Change-Id: I7e0f695c9bf1a6f80bc7e65661bfd5c70cda7d31 Reviewed-on: https://code.wireshark.org/review/29964 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-01Release note updates.Gerald Combs1-5/+5
Switch the Capture Interfaces section to paragraphs and add one for sdjournal. Change-Id: I677a403bf2ea377214c6179f9f22facc9a4ff091 Reviewed-on: https://code.wireshark.org/review/29963 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-01wtap: fix regression in wtap_read_packet_bytesPeter Wu1-6/+2
The "first_free" pointer is currently only increaseed by ws_buffer_increase_length (unused) and ws_buffer_append (for writes). Reading into the buffer should not reduce the available space. Otherwise the next wtap_read_packet_bytes call will reallocate the buffer. This reallocation is unexpected by some users of cf_read_record and results in a use-after-free crash following these steps: 1. Open packet capture. 2. Ignore packet. 3. Open context menu, twice. This crashes because the ByteViewText class points to the buffer which is reallocated after calling PacketList::getFilterFromRowAndColumn. Change-Id: I4f1264a406a28c79491dcd77c552193bf3cdf62d Fixes: v2.9.0rc0-2001-g123bcb0362 ("Make systemd journal entries events.") Reviewed-on: https://code.wireshark.org/review/29915 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-01ieee80211: Display always tag when it is ELEMENT_ID_EXTENSIONAlexis La Goutte1-1/+2
and following packet order for field Change-Id: I724f3d87e02d182021e53eb9f78644420843e593 Reviewed-on: https://code.wireshark.org/review/29936 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-01Qt: Update UAT clear button enablingStig Bjørlykke2-5/+16
Check for enabling the clear button when loading a UatDialog. Also move setting enabled property to false for deleteToolButton, copyToolButton, moveUpToolButton, moveDownToolButton and clearToolButton to uat_dialog.ui. Change-Id: I1ff3ed9906eb541e929297b34abcce2bee4a062c Reviewed-on: https://code.wireshark.org/review/29953 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-10-01Add a systemd Journal Export extcap.Gerald Combs11-5/+706
Add an sdjournal extcap, which reads journal entries using the sd-journal API and dumps them as journal Export Format records. Change-Id: I17ccfa88ab5d053c16c869cd26e580d84022502e Reviewed-on: https://code.wireshark.org/review/29479 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-01Qt: Set enabled properties in Filter DialogStig Bjørlykke1-0/+6
Default set enabled property to false for deleteToolButton and copyToolButton because no item is selected. Change-Id: I99bfb572abb9bc38cbf49c6b1fabdeefac4f8d90 Reviewed-on: https://code.wireshark.org/review/29951 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-10-01Qt: Set enabled properties in Coloring Rules DialogStig Bjørlykke1-0/+6
Default set enabled property to false for deleteToolButton and copyToolButton because no item is selected. Change-Id: I6ead2fa17cf1fd5bc165526fb76d104af6d5234d Reviewed-on: https://code.wireshark.org/review/29949 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-10-01DOCSIS: Fix UCC-REQAdrian Simionov1-6/+2
* UCC-REQ does not contain any Annex C TLVs * Align INFO field for UCC REQ and RSP to similar DOCSIS packets Change-Id: I2cdad12aaf5036b9130c8af3d131ee3a6b317923 Reviewed-on: https://code.wireshark.org/review/29948 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-01ieee80211: fix addresses for ToDS=1|FromDS=1 casePeter Wu1-31/+70
For Data frames with ToDs=1|FromDS=1 and a Frame body containing A-MSDU, the Addr3 and Addr4 fields are not Destination/Source addresses (DA/SA), but BSSID/BSSID. Use the RA/TA fields for the Hw Dest/Src columns and add another BSSID field for Addr4 (should match Addr3, but in theory the wire format could have different values). While at it, fix the A-MSDU case for other cases to match 802.11-2016 Table 9-26 Address field contents. The "Short A-MSDU" case as used by DNG STAs are not handled here though. Tested against a capture with MSDU frames (all but ToDS=1|FromDS=1) and the test case from the linked bug. Bug: 15144 Change-Id: Ic832d7cd7b8e05a1408353cb79c07efed0fb19cc Reviewed-on: https://code.wireshark.org/review/29935 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-01QUIC: fix trailing data after VN packetPeter Wu1-1/+1
The returned offset must be non-zero or the data dissector is invoked. Change-Id: Iaff6e1f19fc94e17b41ad06a8be491fbec4835ba Fixes: v2.9.0rc0-1797-g91c5942c93 ("QUIC: implement packet coalescing (draft >= 11)") Reviewed-on: https://code.wireshark.org/review/29945 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-01Put the FILE_T first in the arguments to parse_dbs_etherwatch_packet().Guy Harris1-4/+4
That puts the two arguments to fill in - the wtap_rec and the Buffer - together. Change-Id: I8850a7aaccc98e5acd292e3cebc1f37cee8a6ce7 Reviewed-on: https://code.wireshark.org/review/29946 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-30Fix the type of the packet data argument to get_xdlc_control().Guy Harris2-2/+2
It's a blob of bytes, so the right type is guint8 *, not guchar *. Change-Id: I74afa95da1e14866af68f1580cfbccd55f08ed65 Reviewed-on: https://code.wireshark.org/review/29944 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-30Fix the type of the packet buffer argument to a capture dissector.Guy Harris2-5/+5
It's a blob of bytes, so the right type is guint8 *, not guchar *. (Yes, in practice, they're both typedefs for "unsigned char" - sadly, C's data types didn't make a distinction between "byte-sized integral value" and "character" - but given that we have different names, let's use them to make it clearer what's being done.) Change-Id: Idb10a208877c84df0432043d69d4aff5a2b2f803 Reviewed-on: https://code.wireshark.org/review/29943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-30Show the *per-file* encapsulation in the __tostring method.Guy Harris1-2/+2
We use the per-file encapsulation everywhere else; use it there as well. Change-Id: I3e3df234a9f541a9d90e54a3c0f41b5019e00bb3 Reviewed-on: https://code.wireshark.org/review/29940 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-30Remove unnecessary clearing of *err.Guy Harris1-2/+0
wtap_read() clears it for you. Change-Id: I736509d54ff385e5b80e9393aeb91c6473b02824 Reviewed-on: https://code.wireshark.org/review/29939 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-30ieee80211: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-2/+0
Clang Change-Id: I357728e347fca35c73864f4ba81949183d5ba34d Reviewed-on: https://code.wireshark.org/review/29937 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-30MPLS: add dissector for Management Communication ChannelChristoph Portner4-3/+57
Management communication channel described in RFC 5718 Change-Id: I5ed95d0d6f25754c50a97457679d08b99db6f527 Reviewed-on: https://code.wireshark.org/review/29920 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-30Small cleanup of the sequential read routine.Guy Harris1-7/+1
There's no need to set *err to 0; it's set by stanag4607_read_file(). There's no need for an intermediate variable to hold the current file offset; just assign it directly to *data_offset. Change-Id: I24bd1c349dd48576a65cc36228a680134427bba5 Reviewed-on: https://code.wireshark.org/review/29938 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-30Qt/FrameInformation: read packet record in private bufferPeter Wu2-12/+9
To prevent potential interference with other users of the capture file, read data in a private buffer instead of reusing the one from capFile. Change-Id: I6d689440e0cc13ef522e874fd8e5795a97a6aca7 Reviewed-on: https://code.wireshark.org/review/29922 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-30Qt/PacketList: read packet record in private bufferPeter Wu1-4/+13
To prevent potential interference with other users of the capture file, read data in a private buffer instead of reusing the one from capFile. An accidental (?) change in commit v2.9.0rc0-2001-g123bcb0362 resulted in "cf_read_record" reallocating the capture_file->buf buffer. That issue combined with the current behavior would result in a crash when ignoring a packet followed by two times opening a context menu: ==32187==ERROR: AddressSanitizer: heap-use-after-free on address 0x7fda91642800 at pc 0x55a98f3faaa7 bp 0x7fffa2807860 sp 0x7fffa2807858 READ of size 1 at 0x7fda91642800 thread T0 #0 0x55a98f3faaa6 in QByteArray::operator[](int) const /usr/include/qt/QtCore/qbytearray.h:476:47 #1 0x55a9901006eb in ByteViewText::drawLine(QPainter*, int, int) ui/qt/widgets/byte_view_text.cpp:370:35 #2 0x55a9900fd109 in ByteViewText::paintEvent(QPaintEvent*) ui/qt/widgets/byte_view_text.cpp:217:9 ... #50 0x55a98e9fd32a in PacketList::contextMenuEvent(QContextMenuEvent*) ui/qt/packet_list.cpp:614:15 ... 0x7fda91642800 is located 0 bytes inside of 3038371-byte region [0x7fda91642800,0x7fda919284a3) freed by thread T0 here: #0 0x55a98e65fd99 in __interceptor_realloc (run/wireshark+0x1019d99) #1 0x7fdac6e1bb88 in g_realloc /build/src/glib/glib/gmem.c:164 #2 0x7fdaac12c908 in wtap_read_packet_bytes wiretap/wtap.c:1368:2 #3 0x7fdaabf01e5a in libpcap_read_packet wiretap/libpcap.c:789:7 #4 0x7fdaabef887d in libpcap_seek_read wiretap/libpcap.c:690:7 #5 0x7fdaac12d5f5 in wtap_seek_read wiretap/wtap.c:1431:7 #6 0x55a98e6c8611 in cf_read_record_r file.c:1566:8 #7 0x55a98e6c88c5 in cf_read_record file.c:1576:10 #8 0x55a98ea0b725 in PacketList::getFilterFromRowAndColumn() ui/qt/packet_list.cpp:1041:14 #9 0x55a98e94e4a1 in MainWindow::setMenusForSelectedPacket() ui/qt/main_window_slots.cpp:1175:39 previously allocated by thread T0 here: #0 0x55a98e65fd99 in __interceptor_realloc (run/wireshark+0x1019d99) #1 0x7fdac6e1bb88 in g_realloc /build/src/glib/glib/gmem.c:164 #2 0x7fdaac12c908 in wtap_read_packet_bytes wiretap/wtap.c:1368:2 #3 0x7fdaabf01e5a in libpcap_read_packet wiretap/libpcap.c:789:7 #4 0x7fdaabef887d in libpcap_seek_read wiretap/libpcap.c:690:7 #5 0x7fdaac12d5f5 in wtap_seek_read wiretap/wtap.c:1431:7 #6 0x55a98e6c8611 in cf_read_record_r file.c:1566:8 #7 0x55a98e6c88c5 in cf_read_record file.c:1576:10 #8 0x55a98e6e0bde in cf_select_packet file.c:3777:8 #9 0x55a98e9ea2ff in PacketList::selectionChanged(QItemSelection const&, QItemSelection const&) ui/qt/packet_list.cpp:420:9 This should be fixed now by I4f1264a406a28c79491dcd77c552193bf3cdf62d, but let's avoid the shared buffer. It's not exactly a hot code path anyway. Change-Id: I548d7293a822601f4eb882672477540f066a066b Reviewed-on: https://code.wireshark.org/review/29921 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-30[Automatic update for 2018-09-30]Gerald Combs11-304/+317
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ic15ad719f659fe7365c9e652af18507a5d050e6b Reviewed-on: https://code.wireshark.org/review/29932 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-30TLS: Add compress_certificate Handshaketype (25)Alexis La Goutte4-0/+70
See https://tools.ietf.org/html/draft-ietf-tls-certificate-compression-03 the value is TEMPORARY registered to IANA (registered 2018-05-23, expires 2019-05-23 Change-Id: I5a91ad4f1366cd7f0fa077677f227a66591494b6 Reviewed-on: https://code.wireshark.org/review/29796 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-09-30Fix comment.Guy Harris1-1/+1
Change-Id: I0517424a19d31a6df50c843689e97600f0bb5a0e Reviewed-on: https://code.wireshark.org/review/29931 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-29Clean up the epan_dissect_t in the normal code path.Guy Harris1-0/+2
We initialized it, but only cleaned it up in an error code path, not in the regular code path. That could leak memory. Change-Id: Ic6689163ca58990fa5091b23e7ab2e0292eed76c Reviewed-on: https://code.wireshark.org/review/29930 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-29Clean up the epan_dissect_t in the normal code path.Guy Harris1-0/+2
We initialized it, but only cleaned it up in an error code path, not in the regular code path. That could leak memory. Change-Id: Icb5aa5b1a2df8919d8a4e54d88a5d865320bd279 Reviewed-on: https://code.wireshark.org/review/29929 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-29Define the wtap_rec next to the Buffer.Guy Harris1-1/+1
They are used together; put them together. Change-Id: I13ec1f37a9a141d3717bfde4db6f1b7e501fb794 Reviewed-on: https://code.wireshark.org/review/29928 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-29Qt/FrameInformation: do not use file-scoped memory for temporary dataPeter Wu1-9/+5
Let QByteArray own the memory instead of wmem to allow memory to be released earlier. Change-Id: Ibf6d1a56120d30daea76924b8006480854dcfbd3 Reviewed-on: https://code.wireshark.org/review/29923 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-09-29wiretap: remove redundant ws_buffer_assure_spacePeter Wu2-4/+0
wtap_read_packet_bytes already calls ws_buffer_assure_space. Change-Id: Ib5c9f7d05ee9f7ba5faa716e941e4c999aa9704f Reviewed-on: https://code.wireshark.org/review/29916 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-29DHCP: For IPv4 options, append address to option rootMartin Mathieson1-0/+3
Change-Id: I739db9d841394582b3ff2f296050a9a1d350f9bc Reviewed-on: https://code.wireshark.org/review/29907 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-29Qt: Show "unknown colorfilters" warning when opening the dialogStig Bjørlykke1-11/+11
Show the warning about unknown colorfilters being disabled when opening the "Coloring Rules..." dialog to make the user aware of this before starting editing the rules. The user may have corrected the filter and enabled it while having the dialog open, and then this warning would be misleading. Change-Id: Ic7f10495e5561bc2fea413c89cf9ebd187c8f113 Reviewed-on: https://code.wireshark.org/review/29909 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-29prefs: Don't remove unknown coloring rules.Stig Bjørlykke1-4/+4
When saving the colorfilters file, keep and disable unknown coloring rules instead of removing them. The user may want to correct the syntax. Change-Id: Ib27612a0601276b6ebbb467d7d253f3f72103d1c Reviewed-on: https://code.wireshark.org/review/29908 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-29prefs: Reset prefs.unknown_colorfilters before reading colorfiltersStig Bjørlykke1-0/+2
Reset prefs.unknown_colorfilters in the beginning of read_filters_file() to avoid a situation when the preference is set and never cleared. This will end up with an error message in UI even when not having unknown color filters. Change-Id: I835dbc2a57f0be6889eb5bce250987dabd796e30 Reviewed-on: https://code.wireshark.org/review/29904 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-29Add a mechanism to register aliases for preference modules.Guy Harris10-27/+119
That way, we don't need a chunk of code in epan/prefs.c that knows about various preference module mappings; individual dissectors can register aliases as appropriate. (The Nortel Discovery Protocol never *had* any preferences, even when it was the SynOptics Network Management Protocol, so there's no need for it to register an alias.) Change-Id: I4a718dac6bb06801cc06a6ee5a28d7ed81e67e5d Reviewed-on: https://code.wireshark.org/review/29914 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-29Clean up indentation.Guy Harris1-6/+6
Change-Id: Ib88054f7fa3d69faf78f889e3c7fed723055b4d4 Reviewed-on: https://code.wireshark.org/review/29913 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-29Get rid of some no-longer-supported GUI preferences.Guy Harris4-57/+6
Make them obsolete preferences; if they had any use, it was with the now-removed GTK+ UI. Change-Id: I2b514148c8066c5c79cb402493f47a21d3679819 Reviewed-on: https://code.wireshark.org/review/29912 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-29Get rid of the printing preferences.Guy Harris3-72/+23
They're no longer used by any of the printing code; mark them as obsolete. Change-Id: Iceaf14f48f1bd35757a9a158a5348f6202b90fc7 Reviewed-on: https://code.wireshark.org/review/29911 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-28Frame: Fixup whitespace.Gerald Combs1-6/+6
Change-Id: I8f377b016501975883dab3abae8b5a1050007dd9 Reviewed-on: https://code.wireshark.org/review/29910 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-28dumpcap: fix some warnings and add some debugsJames Ko2-30/+72
Ping-Bug: 15149 Change-Id: Ifa530fbdcbffbc188343c03fc7b518325a511f5f Reviewed-on: https://code.wireshark.org/review/29906 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-28RRC: upgrade dissector to v15.4.0Pascal Quantin7-87/+85
Change-Id: Iee9dd7b4c5a2d0f7d0ed9dceefcef8825ca8443c Reviewed-on: https://code.wireshark.org/review/29903 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-09-28LTE RRC: upgrade dissector to v15.3.0Pascal Quantin16-5091/+32169
Change-Id: I8ca861fb8cffe457780165c64dc3e6fcbc47ba8b Reviewed-on: https://code.wireshark.org/review/29900 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-09-28gsmtap: Fix parsing of FPC fieldPau Espin Pedrol1-1/+1
Issue was spotted because the bit used by wireshark in this field didn't make sense, as same bit was being used by MS Power field. According to spec "3GPP TS 44.004" section "7.2 SACCH uplink block format", the field is located in bit 6 of the 1st octet. Change-Id: Ia4390b79d9d2b3966c4ca69eda0bf1ae10be7398 Reviewed-on: https://code.wireshark.org/review/29893 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-28http2: fix build without nghttp2Peter Wu1-0/+8
current_stream_id is only defined when built with HAVE_NGHTTP2. One option is to create the session with stream ID unconditionally. As the subdissector (DoH) is chosen based on the Content-Type header and parsing of such headers is only possible with nghttp2, don't bother. Change-Id: Iefee65210974bf5b8b75c6870a0476567b6830e5 Fixes: v2.9.0rc0-2007-gcc69e09981 ("HTTP2: allow subdissectors to query the Stream ID") Reviewed-on: https://code.wireshark.org/review/29896 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-28sharkd: remove compiler warning.Dario Lombardo1-1/+1
../sharkd_session.c: In function ‘json_puts_string’: ../sharkd_session.c:125:20: warning: array subscript has type ‘char’ [-Wchar-subscripts] fputs(json_cntrl[str[i]], stdout); Change-Id: I03a07b8cb42692f636491fad9b15ac71ac0c03f4 Reviewed-on: https://code.wireshark.org/review/29883 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-28sharkd: cast string to be encoded to unsigned char *.Jakub Zawadzki1-5/+3
It should fix warning reported by Stig: [...]/wireshark/sharkd_session.c:125:20: warning: array subscript is of type 'char' [-Wchar-subscripts] fputs(json_cntrl[str[i]], stdout); ^~~~~~~ Change-Id: I9352174223644394ba2bf76f10ff3bf6b6abcad5 Reviewed-on: https://code.wireshark.org/review/29877 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-28Diameter: add a bunch more AVPs from RFC 5777.Jeff Morriss2-89/+343
Add enough AVPs to get the Diameter XML validating again. Also some whitespace and indentation cleanup. Change-Id: Ibebfc8832d50f6347e371ca4b8c5b81548e061a8 Reviewed-on: https://code.wireshark.org/review/29898 Reviewed-by: Anders Broman <a.broman58@gmail.com>