Branch andrew #20
Closed
Branch andrew #20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bug: 14637 Change-Id: I0f271170ce8abcc027a568b01db2bdd8ace56b84 Reviewed-on: https://code.wireshark.org/review/27783 Reviewed-by: Anders Broman <a.broman58@gmail.com>
AsciiDoc allows dashes in macro names but not underscores. Current versions of AsciiDoctor allow the inverse. Remove underscores to allow for easier copying and pasting. Remove asciidoc.conf while we're here. It's no longer used. Conflicts: docbook/release-notes.asciidoc Change-Id: I32d8a4ec695b9e17a80ac720ee9faf62dbb362d3 (cherry picked from commit 585f45cb36853fd3eeaa5b0e2d046f8a818d9acd) Reviewed-on: https://code.wireshark.org/review/27790 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
Remove registering media_type application/octet-stream from both thread and uasip because the settings will interfere each other. Enable decoding as for media_type instead. Bug: 14729 Change-Id: I58c527977fe4713418219fc3126ce7a93c4bb641 Reviewed-on: https://code.wireshark.org/review/27789 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 0362891) Reviewed-on: https://code.wireshark.org/review/27798 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
While SMB1 FIDs are 16-bit, those used in SMB2 are a GUID of 128-bit which are compressed down to 32-bit using g_str_hash. To reduce collision probability which could associate wrong file data with an Exported Object entry, do not truncate this hash value to 16 bits. Bug: 14662 Change-Id: I2a353eca96b0f5ed2157f3678280642151e2e4e7 Reviewed-on: https://code.wireshark.org/review/27794 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot (cherry picked from commit 6705151) Reviewed-on: https://code.wireshark.org/review/27806 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
When an error occurs while saving packets using the Export Specified
Packets dialog (e.g. try to overwrite the opened capture file), the
dialog is displayed again. As PacketRangeGroupBox freed the packet
selection range, a crash (use-after-free) occurs.
Removes some unnecessary code in MainWindow::exportDissections as well.
Change-Id: I63898427eff7e71799d89c8a22246db8f93a9ff6
Fixes: v2.5.0rc0-968-g38b40acb2d ("Qt: fix a memory leak when exporting packets")
Reviewed-on: https://code.wireshark.org/review/27695
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit b078310)
Reviewed-on: https://code.wireshark.org/review/27813
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
"nstime_t{A, B}" is defined as "A + B * 10^9" rather than an integer
part A and fractional part B.
Bug: 14720
Change-Id: I5321db7d5ecea8f976291d2a22667b02162194e2
Reviewed-on: https://code.wireshark.org/review/27775
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit a1e5a15)
Reviewed-on: https://code.wireshark.org/review/27814
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Different dissectors are required for protocols running atop SSL/TLS and protocols running atop DTLS - SSL/TLS provides a byte-stream service, so there's no guarantee that there's a correspondence between SSL/TLS application data record boundaries and packet boundaries, but DTLS provides a datagram service, with packet boundaries corresponding to application data record boundaries. This is similar to the difference between dissectors for protocols running atop TCP and protocols running atop protocols such as UDP. So have two separate tables mapping Application-Layer Protocol Negotiation (ALPN) Protocol IDs to dissector names - one for SSL/TLS and one for DTLS. There are both "over a byte-stream protocol" and "over a packet-oriented protocol" dissectors for STUN and TURN ChannelData packets. Register the "over a byte-stream protocol" ones by name, and use the appropriate ones in the appropriate tables. (There is not one named "stun", so the STUN dissector wouldn't have been called at all.) Change-Id: I054e169f6ae3291abdc7eb58918ef65a17c90a63 Reviewed-on: https://code.wireshark.org/review/27822 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 59b2ea5) Reviewed-on: https://code.wireshark.org/review/27823
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I1c965ee7870ca5a8603f6d41b7f361fa5a02ccf8 Reviewed-on: https://code.wireshark.org/review/27841 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Change-Id: Iaba22d9b431a097eea4bb0dbea3c514a607ef001 Reviewed-on: https://code.wireshark.org/review/27805 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 07f7008) Reviewed-on: https://code.wireshark.org/review/27819 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
If the area address/address prefix is 13 octets long, use the 13th octet, not the 21st octet; the latter is *not* part of the area address/address prefix, and might either not be in the packet or might be some random other part of the packet. Add/expand comments while we're at it. Bug: 14744 Change-Id: I7b90318a72a49b67d8ec17952add528185fd064b Reviewed-on: https://code.wireshark.org/review/27848 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 101b692) Reviewed-on: https://code.wireshark.org/review/27849
It'd only overflow if the value is *so* large that it won't fit in the packet (given that we have a 2^32-1-byte limit on the packet size), so use tvb_ensure_bytes_exist() to ensure we have the entire value before processing the value. (The real problem is that we don't handle the case where there's a value multiplicity > 1 for some types; in those cases, we should loop, processing all the values, which would cause us to eventually throw an exception when we ran past the end of the packet. This is just a quick fix.) Bug: 14742 Change-Id: I447ece81d1c84d3b1d218faeb2c155f910208c29 Reviewed-on: https://code.wireshark.org/review/27853 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 2511889) Reviewed-on: https://code.wireshark.org/review/27854
androiddump determines encap type by parsing pcap global header from tcpdump binary output. Only when libpcap is used with androiddump this (pcap linktype) value can be used right away. Libwiretap uses its own encap values but is feed with pcap linktype values making the whole packet encapsulation invalid. Fix by converting pcap linktype values into wiretap encap values (For pcap linktype definitions see http://www.tcpdump.org/linktypes.html) (For wtap encap defininitions see wiretap/wtap.h) Fixes: bfef57e ("androiddump: Fix and simplify tcpdump capture") Change-Id: I5ea86204b8e5774fd84d4007db8c2910680dbd53 Reviewed-on: https://code.wireshark.org/review/27747 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Florian Bezold <florian.bezold@esrlabs.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> (cherry picked from commit afd0eef) Reviewed-on: https://code.wireshark.org/review/27771 Reviewed-by: Anders Broman <a.broman58@gmail.com>
…ter Renumbering) Bug: 14755 Change-Id: Ie7edc6d7eeb74b968f1358d980bdb86f41ae85ec Reviewed-on: https://code.wireshark.org/review/27846 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit e54c047) Reviewed-on: https://code.wireshark.org/review/27857
Ping-Bug: 14755
Fixes: v2.3.0rc0-1236-gdcb49539d ("ICMPv6: Convert flag fields to use proto_tree_add_bitmask")
Change-Id: I5ba03391739b34fcba60f636d87d46ec5a3f7660
Reviewed-on: https://code.wireshark.org/review/27847
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 20db0ca)
Reviewed-on: https://code.wireshark.org/review/27859
Do not free a tsn_t element if it has already been inserted in a GList. The code structure is complex enough to add an explicit check before calling g_free(). Fixes a regression introduced in gb19ca06fcc. While we are at it, let's call the correct free function and plug some memory leaks. Bug: 14733 Change-Id: I071da96982da569083fd98b790e0d37ac0826ff1 Reviewed-on: https://code.wireshark.org/review/27808 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> (cherry picked from commit 06879e8) Conflicts: ui/tap-sctp-analysis.c Reviewed-on: https://code.wireshark.org/review/27865 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Change-Id: I50da5f8c54c7be49ad8339d22639605daf2c5616 Reviewed-on: https://code.wireshark.org/review/27821 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> (cherry picked from commit e299b40) Conflicts: ui/tap-sctp-analysis.c Reviewed-on: https://code.wireshark.org/review/27866 Reviewed-by: Anders Broman <a.broman58@gmail.com>
While we are at it, let's fix a segmentation fault when preparing the SCTP filter (Qt code was correct). Change-Id: Iaf1be4d2935b211914a842f551fce870bfa7a364 Reviewed-on: https://code.wireshark.org/review/27874 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
We don't need to dissect the body if 1) we're *not* building a protocol tree (tree == NULL) *and* 2) the PDU doesn't have content that can be handed off to subdissectors. (Fix which vs. that issue in a comment while we're at it.) Change-Id: I90890975c05e72cc9ebc776a21683905828f57b5 Reviewed-on: https://code.wireshark.org/review/27876 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 91c069d) Reviewed-on: https://code.wireshark.org/review/27877
That could help find the problem if all we have is the error message, as it'd at least indicate where the problem is occurring. Change-Id: I01154ff62088a4b710c131cb153e8e4593ebc3b2 Reviewed-on: https://code.wireshark.org/review/27878 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 2439483) Reviewed-on: https://code.wireshark.org/review/27879
Change-Id: Iadb3f3daa1095ac9cc971f79ba4d288e8d835a44 Reviewed-on: https://code.wireshark.org/review/27864 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit fab15cd) Reviewed-on: https://code.wireshark.org/review/27882
USB has three possible tables, usb.device, usb.product and usb.protocol (shown in that order in the Decode As dialog). For single packets with no prior device descriptors, the last two tables have no valid selector (integer zero). In such cases it seems more reasonable to use tables for which a valid selector exists (for example, "usb.device"). Bug: 14717 Change-Id: I2319817fa11318a97519d8cfc912343b16224c12 Reviewed-on: https://code.wireshark.org/review/27820 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit ea763a9) Reviewed-on: https://code.wireshark.org/review/27890 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
When there are two segments, but zero requests, "i=1" will be reset to
"i=0" and an infinite loop occurs.
Change-Id: I32cb387ce0724936bcb5d5832b1c90d2bc585998
Fixes: v2.5.2rc0-100-g8f0f691312 ("RPC-over-RDMA: add reassembly for reply, read and write chunks")
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7138
Reviewed-on: https://code.wireshark.org/review/27891
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
(cherry picked from commit d2671e6)
Reviewed-on: https://code.wireshark.org/review/27898
Negative lengths and empty buffers are not uncompressable, reject them. A buffer overrun (read) could occur otherwise due to unsigned "avail_in" becoming insanely large. Bug: 14675 Change-Id: I20b686cc6ad6ef8a8d1975ed3d2f52c8eb1f1c76 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7166 Reviewed-on: https://code.wireshark.org/review/27561 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 9ee790e) Reviewed-on: https://code.wireshark.org/review/27899 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Change-Id: Iba90a9f38c61ea361f990ed1d5cb8859b93a32ba Reviewed-on: https://code.wireshark.org/review/27902 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit c74ba09) Reviewed-on: https://code.wireshark.org/review/27903
Lemon gets this error on its Parse() function, at least on FreeBSD 11.1 with its version of Clang. Change-Id: I4fc1674373af5c0016ee953b61066bf6b24b7ad6 Reviewed-on: https://code.wireshark.org/review/27905 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 8f6c3ee) Reviewed-on: https://code.wireshark.org/review/27906
There was an issue, where siblings where not copied correctly. Bug:14355 Change-Id: I31611a6731f3f4de6b204c7ee708e42f0b7b170c Reviewed-on: https://code.wireshark.org/review/27802 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> (cherry picked from commit 9e4f7dc) Reviewed-on: https://code.wireshark.org/review/27909 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
That's the case on DragonFly BSD 5.2.1, at least. Change-Id: I8bbd51462d74380004c611183f4b9229f4d20ff6 Reviewed-on: https://code.wireshark.org/review/27913 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit a5d3079) Reviewed-on: https://code.wireshark.org/review/27914
The version of Berkeley YACC that comes with NetBSD 7.1 puts a declaration of ascendlval into ascend.h, even when we're building a reentrant parser. That causes a shadowing warning. Suppress some diagnostics before we include ascend.h. Change-Id: I190f0439c36b48c7dfb19a2fe6cef0eb1e96f198 Reviewed-on: https://code.wireshark.org/review/27917 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 93e6ab8) Reviewed-on: https://code.wireshark.org/review/27918
Somebody doing a build will not necessarily have GLib 2.30 or later installed, and somebody doing a cross-build may not be able to get that function from libwsutil, as libwsutil may have been built for a platform different from the one on which the build is being done. Change-Id: Ic3d483b543f9c4d4175879650e157483676fd267 Ping-Bug: 14622 Reviewed-on: https://code.wireshark.org/review/27922 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Bug: 14722 Change-Id: I276ca81f7bd9a75c6fd1e10c4d0cb0840ae03439 Reviewed-on: https://code.wireshark.org/review/27919 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Allocate the exp_pdu_data using the wmem_packet_scope allocator so the epan_dissect_run_with_taps will free it after calling all registered tap listeners. valgrind --tool=memcheck --leak-check=full ./run/tshark -r sctp.pcap -U "OSI layer 3" -w exported.pcap 32 bytes in 1 blocks are definitely lost in loss record 48 of 76 at 0x4C2EBAB: malloc (vg_replace_malloc.c:299) by 0xB3FC3C5: g_malloc (gmem.c:99) by 0x68C2BE1: export_pdu_create_tags (exported_pdu.c:251) by 0x68C2D5E: export_pdu_create_common_tags (exported_pdu.c:231) by 0x70AA54E: create_exp_pdu_proto_name (packet-sctp.c:3240) by 0x70AA54E: export_sctp_data_chunk.part.23 (packet-sctp.c:3268) by 0x70AB76B: export_sctp_data_chunk (packet-sctp.c:3256) by 0x70AB76B: dissect_data_chunk (packet-sctp.c:3509) Change-Id: I6e247ab2861bbb053f0958faf253913b28dbcbeb Reviewed-on: https://code.wireshark.org/review/29126 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 88dd7e7) Reviewed-on: https://code.wireshark.org/review/29131
Bug: 14884 Change-Id: Id409563d5e8869596db7b479132045bf8cf88f16 Reviewed-on: https://code.wireshark.org/review/29128 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit c48d6a6) Reviewed-on: https://code.wireshark.org/review/29134 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Display correct temperature unit for the Temperature Measurement Value. Bug: 15058 Change-Id: I310c2fabfb1a824cb84f6f4182e881d7a22495cb Reviewed-on: https://code.wireshark.org/review/29139 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 4236185) Reviewed-on: https://code.wireshark.org/review/29143 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Change-Id: Ib97a2b762873ed8cdb1960d103e9513cca53492b Reviewed-on: https://code.wireshark.org/review/29145 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 03b0464) Reviewed-on: https://code.wireshark.org/review/29149 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Change-Id: Id22f75c609197131517ff2ac4a3daec6624a9701 Reviewed-on: https://code.wireshark.org/review/29162 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
On Windows the code calling extcap worked as follows: 1. Create stdout and stderr pipes with default buffer size 2. Execute extcap redirecting output to the pipes 3. Wait for extcap process to exit 4. Read the data from stdout pipe This resulted in deadlock when the extcap wrote more data than the pipe could buffer. This was especially seen with USBPcap as it is quite normal to have plenty of USB devices connected. Fix the issue by contantly reading the stdout data and storing it in GString. To prevent similar deadlock on the stderr, the stderr data is being constantly monitored as well (and discarded). Change-Id: I0f93e6d79617cef0e828aef2b96fad2757227923 Bug: 14657 Reviewed-on: https://code.wireshark.org/review/29159 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> (cherry picked from commit c18459e) Reviewed-on: https://code.wireshark.org/review/29161 Petri-Dish: Roland Knall <rknall@gmail.com>
The Remarks section in WaitForMultipleObjects describes what kind of handles the function can wait for. Pipe handles are not listed there. The problem was introduced in c18459e While it might be possible to setup overlapped reads on the pipe handles and then wait on overlapped events, it would result in quite complex code. As a tradeoff, simply keep peeking at the pipes every 100 ms. Change-Id: I6ba4f4bf4c1d2af856027cca36ffd6d4f7f49f36 Bug: 14657 Reviewed-on: https://code.wireshark.org/review/29163 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> (cherry picked from commit 9ecc790) Reviewed-on: https://code.wireshark.org/review/29167
When early data is present but undecryptable (due to lack of keys), it should not result in incrementing the sequence number or the following application data from the client will fail to decrypt. Change-Id: I8016a30508d96c14cbd6a3b9c4af1591a6c437c3 Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/29169 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit fd7ec35) Reviewed-on: https://code.wireshark.org/review/29172 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I3796dc77161070f5a6c7bf3978264b875ffffd05 Reviewed-on: https://code.wireshark.org/review/29192 Reviewed-by: Gerald Combs <gerald@wireshark.org>
This fixes commit g2c89e6c448 Bug: 15068 Change-Id: Ieec7ffb039af48903f9ee3f91800f603203f811e Reviewed-on: https://code.wireshark.org/review/29201 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 99df348) Reviewed-on: https://code.wireshark.org/review/29202
Change-Id: I4a2e2142bbaf08e11a735d125a201c8651cdc857 Reviewed-on: https://code.wireshark.org/review/29217 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 428b5a28827cce96f754b407da8576890b1dff40) Reviewed-on: https://code.wireshark.org/review/29220
Free the memory as documented. Change-Id: I8a8842160be676bb08f5b93e795b9ed8edef2ede Reviewed-on: https://code.wireshark.org/review/27829 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit ac041b9) Reviewed-on: https://code.wireshark.org/review/29227 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Ensure we remove the info status for a selected field when closing a capture file to bring the text back to "Ready to load or capture". Change-Id: I2946675b2c0bc47cb8c05c1d391ff8a0875e8c7f Reviewed-on: https://code.wireshark.org/review/29216 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 04dbbb1) Reviewed-on: https://code.wireshark.org/review/29241 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Boolean field types will default to tfs_true_false if not having a TFS set, so this should always be enabled for resolve. Remove FT_FRAMENUM from this check because they will probably never have a TFS or VALS setting. Change-Id: I6295f8b7c9db7295eab1750e9c2cf0ee7382d43d Reviewed-on: https://code.wireshark.org/review/29218 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit a6a915a) Reviewed-on: https://code.wireshark.org/review/29242 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Store the association id instead of a pointer to the volatile
"sctp_assoc_info_t" structure because it gets freed after a rescan.
Bug: 14970
Change-Id: Id8fe2dfe3549bd711fc8ddef0770b217e83c2088
Fixes: v1.11.3-rc1-604-g796bf409b0 ("Add dialogs and graphs to analyse SCTP behavior similar to the GTK version.")
Reviewed-on: https://code.wireshark.org/review/28711
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit b7a6a11)
Reviewed-on: https://code.wireshark.org/review/29244
Tested-by: Petri Dish Buildbot
"fillTable()" overwrites "sctp_assocs" with an external address. Change-Id: I415d424f16a2306b1b79fde7b5f836458da14b16 Reviewed-on: https://code.wireshark.org/review/27833 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 2ef7e8c) Reviewed-on: https://code.wireshark.org/review/29250 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
The hint label in Show Packet Bytes shows information about the selected field, and the user should be able to select this text using the mouse. Change-Id: Ic969dbd07cb1fcd61d0e8f777692523a0fc5850b Reviewed-on: https://code.wireshark.org/review/29259 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit c79ba26dafa685d36398858842a31a7680c9a071) Reviewed-on: https://code.wireshark.org/review/29264
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Idd72b034f62dd762dbb1ee43766b3450cea34d5e Reviewed-on: https://code.wireshark.org/review/29287 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Bug: 15075 Change-Id: Ie18c1a04adac1d42d78fa86d289c659566a81891 Reviewed-on: https://code.wireshark.org/review/29295 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 0fa2b0b) Reviewed-on: https://code.wireshark.org/review/29296
Change-Id: I20157ce72b33b8b957d47fe6abcffb754ce4e5a2 Reviewed-on: https://code.wireshark.org/review/27043 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 7124fe6) Reviewed-on: https://code.wireshark.org/review/29297 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Bug: 15079 Change-Id: I97e5179f1385d24b38a0537a91bc73a9eb3a241b Reviewed-on: https://code.wireshark.org/review/29299 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 9b04385f764ada26cedf183c1deede375ae83ca2) Reviewed-on: https://code.wireshark.org/review/29301
Limit Valgrind to the first 10,000 packets in each file. Conflicts: tools/fuzz-test.sh Change-Id: I27be212ddb437c643ffb413bb9d1c809dbe98a55 Reviewed-on: https://code.wireshark.org/review/29210 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 6ee559e) Reviewed-on: https://code.wireshark.org/review/29312
Change-Id: If4ac63b99b28270b941eebcb97f6214d937a0024 Reviewed-on: https://code.wireshark.org/review/29323 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Change-Id: I175ef6e17f8a50e6c55e79d130599be6d9b57cf0 Reviewed-on: https://code.wireshark.org/review/29336 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-updated script call to pass along the probe id
|
Hi, thank you for your contribution! GitHub is however not the right place for these, please have a look at |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.