summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-06-21SearchBar - Focus on shortcut instead of closingRoland Knall2-3/+4
If the searchbar is already open focus on the bar and highlight existing test, instead of closing an already open bar Change-Id: I4f8ae2e903cb65c0ebca238f3bcc1c62b63b5c3b Reviewed-on: https://code.wireshark.org/review/22223 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit d83176ed2edffe59badd75d8ee98c77227fd357f) Reviewed-on: https://code.wireshark.org/review/22281 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-21tcp: Change the wording to include (s)Roland Knall1-1/+1
More than one packet could be meant by that Change-Id: Ie751a282c927608414673c2cd48b11dc5e6d5ea6 Reviewed-on: https://code.wireshark.org/review/22283 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 050da447424223d39d1e494b8daab840a100d05e) Reviewed-on: https://code.wireshark.org/review/22295
2017-06-20Fix filter for "Next Packet in Conversation"Peter Wu5-76/+32
The "Previous/Next Packet in Conversation" actions accidentally overwrites more specific filters (like TCP port matching) by less specific ones (like IP addresses). This resulted in strange behavior where packets from different TCP streams were selected. Change-Id: Ifa93064e1db3777fa3c12e2220bbb0b36b9478fe Reported-by: Christian Landström Reviewed-on: https://code.wireshark.org/review/22274 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 4deb97f31f52ca9c88efbbf46cf3e580c85474f3) Reviewed-on: https://code.wireshark.org/review/22287
2017-06-20IP: ensure that fragment contains payload before adding it for reassemblyPascal Quantin1-0/+1
Solves a UBSan runtime error null pointer passed as argument 1, which is declared to never be null. It can be reproduced with the pcap from bug 13603 Change-Id: I0d6fdddcccc892b3141855d59be372887afcaca5 Reviewed-on: https://code.wireshark.org/review/22272 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: Anders Broman <a.broman58@gmail.com> (cherry picked from commit e6883c15ac00942e3232213f087147e355f7494b) Reviewed-on: https://code.wireshark.org/review/22284
2017-06-20Qt: Rename "Filter Expressions" to "Filter Buttons"Stig Bjørlykke1-1/+1
Change-Id: I7adcb1d28d239bbc25d8a7a5969b34c6db84e022 Reviewed-on: https://code.wireshark.org/review/22277 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 75f9247c2cfec63caeb59039de972abc768e3a4b) Reviewed-on: https://code.wireshark.org/review/22279
2017-06-20Qt: Create the user profiles dir at startupStig Bjørlykke3-25/+54
Ensure the user profiles directory is created at startup so that users can put downloaded profiles without creating the directory. Change-Id: Ib06bb3055daef8fd9e78d7887ce56f8fe50e48bf Reviewed-on: https://code.wireshark.org/review/22275 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> (cherry picked from commit 4f1053c5464de12b635a8cf4128b78d51f6f3deb) Reviewed-on: https://code.wireshark.org/review/22278 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-20Misc snort fixes.Martin Mathieson3-7/+60
- search for content fields taking into account length of last match - handle absolute path to file file inclusion not using $RULE_PATH - parse longer tokens (saw emerging-threats rule with enormous pcre) - content offset is relative to start of frame, *not* previous content match - show content modifiers 'rawbytes' and 'http_user_agent' Change-Id: I0a4e0b857c8049380ed6aa47e4a3d3649e84d4ad Reviewed-on: https://code.wireshark.org/review/22211 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit d19c3a22b927db0dc83bcad9e024a8ed8f866671) Reviewed-on: https://code.wireshark.org/review/22269 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-20GTPv2: put dissection under GTPv2 protocol itemPascal Quantin1-7/+5
Bug: 13813 Change-Id: Ic1582406896b2d4d3505ae1d3bb79cdbafa481da Reviewed-on: https://code.wireshark.org/review/22247 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 59670461b00414d504b2a9ed9e7bafeab65a7420) Reviewed-on: https://code.wireshark.org/review/22270 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-20IEEE 802.11: Use correct mask for 'SMK message'Robert Sauter1-1/+1
Change-Id: I2def75c999faec0cbb16fd87133f09544bff78c4 Reviewed-on: https://code.wireshark.org/review/22264 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 23e667169eefc450808e60ea515fc271122052de) Reviewed-on: https://code.wireshark.org/review/22266
2017-06-20Qt: make Wireless Timeline a separate itemPeter Wu6-18/+29
Do not put the wireless timeline in the main view with splitters, it has a fixed size anyway and is not taken into account for layout and size calculations for the panes. Bug: 13776 Change-Id: I71da962950c3f1b215908674f4852afa76744343 Reviewed-on: https://code.wireshark.org/review/22242 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Simon Barber <simon.barber@meraki.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 4d90f2e092802775e5e3e457768d1c1f4760a1f0) Reviewed-on: https://code.wireshark.org/review/22265
2017-06-20Don't scroll back to the selected frame when we get name resolution updates.Jeff Morriss2-4/+12
With live or large capture files and asynchronous name resolution this can cause serious scrolling issues as the name resolutions come in. Bug: 12074 Change-Id: I1a5cca410c0608927b32e9e7107885370caf14d7 Reviewed-on: https://code.wireshark.org/review/22245 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 4e46352657df1d66e8f2ade8c5e3d38ecae18530) Reviewed-on: https://code.wireshark.org/review/22262 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-20PROFINET IO: define an arbitrary recursion depth limitPascal Quantin1-3/+12
Bug: 13811 Change-Id: I52bffd4a79dcdad9da23f33e1fc6a868472390bf Reviewed-on: https://code.wireshark.org/review/22232 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit fbfb87a2439dd18f2318586b8e5a2f6db410ba6a) Reviewed-on: https://code.wireshark.org/review/22254 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-20Qt: Turn off auto scroll when going to a packetStig Bjørlykke2-1/+17
When going to a packet (first, last, next, prev and specific) during capture we must turn off auto scroll to let the packet be shown in the packet list. Change-Id: If1c615eb4d422c3b4c0418114064f7a4a0b75b35 Reviewed-on: https://code.wireshark.org/review/22244 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> (cherry picked from commit be4dbf840b164ab9b788ee8c3a9466e2da1393d2) Reviewed-on: https://code.wireshark.org/review/22259 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-20AMQP: workaround some proto_tree_add_none_format() assertsPascal Quantin1-14/+14
Previously proto_tree_add_none_format() could be called with any type of field type, not FT_NONE only. Change-Id: I78976a168fc1bf606b72ad38d284bb0bd1794b03 Ping-Bug: 13780 Reviewed-on: https://code.wireshark.org/review/22243 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> (cherry picked from commit 2de483c0925a5a93cdaee168997f3f3c7949d2d4) Reviewed-on: https://code.wireshark.org/review/22257
2017-06-20MQ: check fragment length before trying to perform reassemblyPascal Quantin1-5/+28
Bug: 13792 Change-Id: Id0c116655288c5a3347911281a932ae80250c24f Reviewed-on: https://code.wireshark.org/review/22233 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: Anders Broman <a.broman58@gmail.com> (cherry picked from commit bb58b3a2643ab81560d84b00be3a9b9e86f0393c) Reviewed-on: https://code.wireshark.org/review/22251 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-20AMQP: fix a stack overflow when offset goes back and forthPascal Quantin1-1/+7
Previous code assumed that list decoding was successful and that some bytes were consumed. Let's explicitly check this. Bug: 13780 Change-Id: I3546b093f309f2b8096f01bc9987ac5ad9e029eb Reviewed-on: https://code.wireshark.org/review/22235 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: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 246cbbc2ea6dd0a3a69a1aaa94db244a77565353) Reviewed-on: https://code.wireshark.org/review/22248
2017-06-19Register for SFLOW_245_HEADER_FDDI.Guy Harris1-0/+2
In 609ea4baa62a523434cdd8ff350d56d135d588ae (I459249b98741cc069495c84ad4c47c0aa6768096) I unintentionally removed the registration. Put it back. Change-Id: I4769fc10d74fe7358f9794b9697591c61324e883 Reviewed-on: https://code.wireshark.org/review/22239 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 051921854d8720123bd671af3ba3a123da2cfab3) Reviewed-on: https://code.wireshark.org/review/22240
2017-06-19DAAP: define an arbitrary recursion depth limitPascal Quantin1-4/+24
Bug: 13799 Change-Id: I611e3e888f91f78262e0d685e613a2bc221687c5 Reviewed-on: https://code.wireshark.org/review/22210 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> (cherry picked from commit 82fc557bed30b1aa69ca43a4291b64a9ce54c78a) Reviewed-on: https://code.wireshark.org/review/22229
2017-06-19Qt: Flush signals when disable protocolsStig Bjørlykke1-0/+4
When opening the enabled protocols dialog from a protocol preferences menu we must flush app signals to ensure a redissect is done. Change-Id: I512b8f6959aabcc15ccffc67615583ee9c60ceec Reviewed-on: https://code.wireshark.org/review/22224 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> (cherry picked from commit 583c2504671e1671afd03e7638cf6c2957d2b020) Reviewed-on: https://code.wireshark.org/review/22228
2017-06-19Put the definition of BIT_SWAPPED_MAC_ADDRS in the file where it's used.Guy Harris2-5/+12
In change 18a3b0659c209a2e0121eacd640b75e6c1c3b87d, I moved the table that uses it, but not the actual definition, from libpcap.c to pcap-common.c; they both should have been moved. Make it so. Change-Id: I266fce455df3848b873cdfadb12cecdbf9c8d4d3 Reviewed-on: https://code.wireshark.org/review/22216 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e9e1b4816278a131aa38dfc579ccd975fed2d7c7) Reviewed-on: https://code.wireshark.org/review/22217
2017-06-19Register for WTAP_ENCAP_FDDI.Guy Harris1-0/+1
In 609ea4baa62a523434cdd8ff350d56d135d588ae (I459249b98741cc069495c84ad4c47c0aa6768096) I unintentionally removed the registration. Put it back. Change-Id: I7cf216378e1610350949910091ee187ce150ca05 Reviewed-on: https://code.wireshark.org/review/22213 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 547b08b49527eb97ac2ab37fbbcb5a728869d2fd) Reviewed-on: https://code.wireshark.org/review/22214
2017-06-18OpenSafety: sanity check calculated length.Michael Mann1-14/+14
Original sanity check was missed for fragmentation Bug: 13755 Change-Id: If9e24e01a119c869b02f198456776c8e6c6f2ad0 Reviewed-on: https://code.wireshark.org/review/22193 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> (cherry picked from commit 66c50585e5c10764d0b8a850fd49fa7012346560) Reviewed-on: https://code.wireshark.org/review/22208 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-18[Automatic update for 2017-06-18]Gerald Combs11-265/+564
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Iabd301cc4cda3d645854111fa5638d4b55cc8953 Reviewed-on: https://code.wireshark.org/review/22204 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-17Clean up whitespace.Guy Harris1-3/+3
Change-Id: I67616d3ea6d325000c22c550c4d20c320b1c51db Reviewed-on: https://code.wireshark.org/review/22195 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 43700544312f33ca78199de6003f8c4328df2203) Reviewed-on: https://code.wireshark.org/review/22196
2017-06-17Expose RTPS dissector for Lua.Michael Mann1-0/+13
See https://ask.wireshark.org/questions/61824/how-to-get-a-reference-to-an-existing-heuristic-dissector-in-lua-in-order-to-wrap-rtps Change-Id: I926b974da8e2de35c64cc46cba7b38e71368fcdd Reviewed-on: https://code.wireshark.org/review/22137 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 57fece13e06b347ef14f106ec9ee19f2d13b0182) Reviewed-on: https://code.wireshark.org/review/22194
2017-06-17Do not process UI events while reading from live capturePeter Wu1-6/+0
For at least Qt, the main_window_update callback is not necessary to make the stop button work. When restarting a live capture during a flood (via Ctrl-R), this callback actually results in an infinite loop in MainWindow::captureStop since the capture state never changes from FILE_READ_IN_PROGRESS. Remove this callback to ensure that the problematic pipeActivated / sync_pipe_input_cb / capture_input_new_packets / main_window_update / ... / on_actionCaptureRestart_triggered / testCaptureFileClose / captureStop sequence is avoided. Even though captureStop invokes capture_stop, I guess that this does not change the state because the pipeActivated callback is already active. Bug: 10917 Change-Id: I6ca4fa946963928b7bc8a53ca14f9a9a3a35eaa7 Reviewed-on: https://code.wireshark.org/review/22097 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 553b1e0215ad5826906aafbe0e38c1e44cf9e1c3) Reviewed-on: https://code.wireshark.org/review/22191
2017-06-17Qt: fix hang on exiting Qt while loading capture filePeter Wu2-10/+47
testCaptureFileClose can also be invoked while reading an existing capture file (the original comment only applied to GTK+, not Qt). When the user quits Wireshark while reading an offline pcap, this could result in a confusing "Unsaved packets" dialog. Fix this by checking the actual capture session state. After fixing this, the next issue is that cf_close trips on an assertion ("cf->state != FILE_READ_IN_PROGRESS"). To address this problem, do not close the capture file immediately, but signal to the reader (cf_read) that this should be done (similar to the quit logic in GTK+). Bug: 13563 Change-Id: I12d4b813557bf354199320df2ed8609070fdc58a Reviewed-on: https://code.wireshark.org/review/22096 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 800a856fb4784e31347e15a8ec825d2daeb62350) Reviewed-on: https://code.wireshark.org/review/22190
2017-06-17PIM: Add identification of Hello option 65004Jaap Keuter1-0/+3
Cisco uses propietary option 65004 to transmit RPF Proxy Vector information. Add the name of the option to the option identification. Change-Id: I5ee9e4d44d6326d8a457a8a4bbb24896e17216e8 Reviewed-on: https://code.wireshark.org/review/22186 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit b2fa26ff7a270dc6a0f70c06cdc3e186f0c9d29f) Reviewed-on: https://code.wireshark.org/review/22189
2017-06-17Handle CMD over GRE.Guy Harris2-4/+47
Bug: 13804 Change-Id: I0d96122a0c7f39315316e4da32c29977e147d3d6 Reviewed-on: https://code.wireshark.org/review/22183 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e2efa82811ee987dfe96929dd8383c45104dec0b) Reviewed-on: https://code.wireshark.org/review/22184
2017-06-17gsm_sms: decode UCS2 as UTF-16Vasil Velichckov1-4/+12
Some phones (Android and iOS smartphones) encode emoji characters as UTF-16 big endian and although the UTF-16 is not specified in the 3GPP 23.038 (GSM 03.38) it seems to be widely supported Bug: 13808 Change-Id: Ic4a600e42fb4b471223aaef1a661bd002835b519 Reviewed-on: https://code.wireshark.org/review/22181 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 85e2a54703da8adee8bf7aefc67f4851ee3b3f1d) Reviewed-on: https://code.wireshark.org/review/22182
2017-06-16Have two separate routines for wlantap dissection - OCTO and pre-OCTO.Guy Harris1-868/+904
The two code paths don't share any code, so they might as well be in separate routines. That makes it even easier to read. Change-Id: I8ee335f4cac2aedc42216db7f9674e1a609d9347 Reviewed-on: https://code.wireshark.org/review/22179 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 8b99bb7fbf80f2fd3bfe53bbbfa14caec6319cbd) Reviewed-on: https://code.wireshark.org/review/22180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16Further cleanup.Guy Harris1-50/+24
Move some commented-out code where it belonged, and #if 0 it out instead. Have only *one* test for OCTO. Change-Id: I6e8803f936ebd88f1705b2185f034ec0b2bddb77 Reviewed-on: https://code.wireshark.org/review/22177 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 8ab033a2838ee94879910fd3ab9860122a72f151) Reviewed-on: https://code.wireshark.org/review/22178
2017-06-16Clean up the 802.11 payload handling a bit.Guy Harris1-6/+10
Two separate checks for OCTO, one right after the other, is a bit confusing. Change-Id: I702aa1809dc7271b69b5419dc850228fac516ed6 Reviewed-on: https://code.wireshark.org/review/22175 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit d217b757cb1c627e53d9cffe47fa5f47c38045de) Reviewed-on: https://code.wireshark.org/review/22176
2017-06-16Fix SURROGATE_VALUE() to match what RFC 2781 says.Guy Harris2-1/+3
While we're at it, note in the comment for get_utf_16_string() the "decoding UTF-16" algorithm in RFC 2781. Change-Id: I5d7dc5c09af0474c055796e49e0c7b94fa87d2ad Reviewed-on: https://code.wireshark.org/review/22171 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 435c68cd2b856a6be7d015e8703c6c83d9b8eb89) Reviewed-on: https://code.wireshark.org/review/22172
2017-06-16Rename FindOS_X_FRAMEWORKS.cmake for the new OS name.Guy Harris1-0/+0
It's now FindMACOS_FRAMEWORKS.cmake. (But is it actually *used*? CMakeLists.txt does the check itself.) Change-Id: I6e972869b94da959dc7c9a3fccacfbd35e0e992c Reviewed-on: https://code.wireshark.org/review/22163 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit a0dfbccdfca79da5ed9bc250d18bceedd3598276) Reviewed-on: https://code.wireshark.org/review/22164
2017-06-16Change some names to reflect Apple's new UNIX-for-Macs name.Guy Harris9-24/+24
{OS_X,os_x} -> {MACOS,macos}. Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de Reviewed-on: https://code.wireshark.org/review/22161 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 5039d0e57635589208e1d969a57250746e422e06) Reviewed-on: https://code.wireshark.org/review/22162
2017-06-16Rename a routine to match the OS name.Guy Harris1-2/+5
It's now "macOS". While we're at it, note that the property list from which it fetches version information still calls it "Mac OS X". Change-Id: I438ef9dc65c2619d7378b0deb5efc84734a2ac6d Reviewed-on: https://code.wireshark.org/review/22159 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 63b91ad3119c64eb8fdaa67303fe37d71a01a1b0) Reviewed-on: https://code.wireshark.org/review/22160
2017-06-15packet-btrfcomm.c: Prevent over bit shift in get_le_multi_byte_value.Michael Mann1-1/+1
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2163 Bug: 13783 Change-Id: I92cefec86f9545345d00cf28e32ef7c05064417c Reviewed-on: https://code.wireshark.org/review/22141 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 552dab08a6ea1b47465d888c613c353f8697e918) Reviewed-on: https://code.wireshark.org/review/22152 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-15udpdump.c: Don't include epan headers.Michael Mann1-3/+0
udpdump has local copies of the tag values from exported_pdu.h, so the dependency isn't needed. exported_pdu.h required tv_buff.h and packet_info.h, whose inclusion caused link errors on SPARC. Bug: 13801 Change-Id: Icbf7b59b8af0d3a0fc73599baad6932e76dc3462 Reviewed-on: https://code.wireshark.org/review/22131 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 828e1f07a82feb821c8169236fde18570ec01313) Reviewed-on: https://code.wireshark.org/review/22151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-15Make the short names for USB encspsulation types more regular.Guy Harris1-2/+2
Have them all be "usb-XXX", where XXX indicates the type of header. Change-Id: I7f1bfea7e264b17c57f94c484d64d1cce91b9b78 Reviewed-on: https://code.wireshark.org/review/22147 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit ee0dde474c20afb4c493441400926ad7924ca458) Reviewed-on: https://code.wireshark.org/review/22148
2017-06-15Better names for various USB headers.Guy Harris1-2/+2
Change-Id: Iec2126fa1b71d9923ef0fb9ca2a027f7752d71f3 Reviewed-on: https://code.wireshark.org/review/22144 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 6f8bc61c3323b959900f125234e7055018d62e4b) Reviewed-on: https://code.wireshark.org/review/22145
2017-06-15Miscellaneous texual corrections and additionJaap Keuter3-3/+8
Correct some symbolic references in source file comments and add a note about the CMake configuration options. Change-Id: Idb670a2c798c2a52cdce142340ce8fc5a2022508 Reviewed-on: https://code.wireshark.org/review/22138 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 2a5cb8e32e31ed0fb64b97318dd38470886d9154) Reviewed-on: https://code.wireshark.org/review/22142
2017-06-15RADIUS: Fix dissection for non-default VSA lengthsJoão Valverde1-7/+11
Ping-Bug: 13745 Change-Id: I1c9f69d0015ba9bea16d8300fbfd85abe110f829 Reviewed-on: https://code.wireshark.org/review/22136 Reviewed-by: João Valverde <j@v6e.pt> (cherry picked from commit 9ed4046e0f3e8872c3adec3f11376ee392834525) Reviewed-on: https://code.wireshark.org/review/22139 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-14IEEE 802.15.4: Fix IE/MIC handling of secured packets without payloadRobert Sauter1-7/+6
Change-Id: Icdcb770723e3783013f525524c3fe745d5dd862d Reviewed-on: https://code.wireshark.org/review/22122 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit ae085f7338b356f249bbc639ce70412ece42a708) Reviewed-on: https://code.wireshark.org/review/22133
2017-06-14WBXML: Fix some more potential infinite loops.Michael Mann1-5/+11
tvb_get_guintvar can generate some unrealistic values so do some sanity checking on them. Bug: 13796 Change-Id: I2d5f7a48c2e982a419ea6ab3ac0000be3b6bcbc7 Reviewed-on: https://code.wireshark.org/review/22121 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 50fa2d95833ec2e2b0de3000eda7b290fc23eaeb) Reviewed-on: https://code.wireshark.org/review/22128
2017-06-14DOCSIS: Prevent infinite loop from unknown FCParm.Michael Mann1-0/+4
concatlen was not updated if FCParm was unknown, leading to an infinite loop. Bug: 13797 Change-Id: I1b64d757a369183a711f01b0b5cd1ba7aa0787bc Reviewed-on: https://code.wireshark.org/review/22120 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 26a6881014c85c935f2794f6eeb852849137c20a) Reviewed-on: https://code.wireshark.org/review/22124
2017-06-13Fix automatic name resolution not saved to NRBAnthony Coddington1-0/+4
Clear DUMMY_ADDRESS_ENTRY when add_ipv4_name/add_ipv6_name. This flag is checked in ipv4_hash_table_resolved_to_list(). TODO: clean up these flags as they are confusing and DUMMY appears somewhat redundant. Change-Id: I81d40cc778cbe5c36314631d3fa0997cee409368 Bug: 13798 Reviewed-on: https://code.wireshark.org/review/22109 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit f3267f17a3fc3c8ab138940653f2e968c5d27378) Reviewed-on: https://code.wireshark.org/review/22114
2017-06-12address(.h): fix typo adresses => addressesAlexis La Goutte1-2/+2
Change-Id: Ibc787005bb7865da55d2d8257009bace1108f181 Reviewed-on: https://code.wireshark.org/review/22082 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit d4e51deadb280b822532a268304fed0e03b31cac) Reviewed-on: https://code.wireshark.org/review/22099 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-12netflow: fix typo adresses => addressesAlexis La Goutte1-1/+1
Change-Id: I8578f86f75b1a7278ad71d8671ce4e2dbc4f0c82 Reviewed-on: https://code.wireshark.org/review/22081 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 0813fccb089ae6c9a910604f137fa8f99e66e142) Reviewed-on: https://code.wireshark.org/review/22100 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-12Windows: increase minimum CMake version to 3.7Pascal Quantin1-4/+2
g9f0d22b introduced the use of GREATER_EQUAL operator. Let's update the minimum CMake version accordingly. Change-Id: Ibf619a24f5ee296b547fbc6ba46e13b8a1f3302c Reviewed-on: https://code.wireshark.org/review/22066 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 4edc611526fc2aa17a7f5e82ce0147d799d2c508) Reviewed-on: https://code.wireshark.org/review/22092
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-09 22:02:43 +0000