summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-06-22MQ: put declaration before codePascal Quantin1-1/+2
Change-Id: I2b0d1a4795e3278a1702d51d4fd532a37a4eba19 Reviewed-on: https://code.wireshark.org/review/22332 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-21Lua: Add "tonumber" method to NSTimeSilvio Gissi3-7/+22
Absolute and Relative time fields could not be converted to seconds without converting to string and parsing to number. Fixed conversion in generated code that was subject to precision loss Usage: f=Field.new("frame.delta_time") delta=f().value:tonumber() Change-Id: I6ef91c6238a6c2ed9adf6cae03f8913f0a09332e Reviewed-on: https://code.wireshark.org/review/22316 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-21Qt: fix sorting of custom columns with multiple fieldsPeter Wu2-14/+37
Fields like "dns.time || http.time || smb.time" were sorted by column number before. Recognize when all fields are numeric values and then try to sort by number and otherwise fallback to a value comparison. In theory sorting should now also be a bit faster for custom columns because the columnn type is looked up once. Change-Id: Id40d7cce8080d05823d74459fc493ec6ebf80956 Reported-by: Laura Chappell Reviewed-on: https://code.wireshark.org/review/22317 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21wsutil: Check return from ws_writeStig Bjørlykke1-2/+3
Change-Id: I73f65222dc23ebcb484f2598a12f43b284654420 Reviewed-on: https://code.wireshark.org/review/22321 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-21wsutil: Ignore return from ws_writeStig Bjørlykke1-2/+2
Change-Id: Idad4dd84538e3ccb7b258775704db8b6bd6c301e Reviewed-on: https://code.wireshark.org/review/22319 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-21ftp-data: track setup frame, method and command from ftpMartin Mathieson1-34/+140
Change-Id: Iaa06b2e43a69f9a399ff81dd7a1e389e078608e4 Reviewed-on: https://code.wireshark.org/review/22292 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21[sipstat] Update the Response Codes table.Anders1-2/+21
Change-Id: Iae6e49963ea94ba8a174342e25d2ca5494001e28 Reviewed-on: https://code.wireshark.org/review/22310 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21Qt: display newlines in capture file commentsPeter Wu1-2/+2
Due to the use of HTML, whitespace (including newline) are shown as single horizontal space. Add a special case for newlines. Bug: 13819 Change-Id: Iefa2af7d2948ed18a3b7f8f4ee8cb90100bf3460 Reviewed-on: https://code.wireshark.org/review/22306 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21[filesystem.c] Add a cast to aviod a warning with VisualStudio 2017.Anders1-1/+1
Change-Id: I95186bd54ae487e112fcb533c62bb8f9b210dc24 Reviewed-on: https://code.wireshark.org/review/22309 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21wsutil: Free files in reset_default_profileStig Bjørlykke1-0/+1
This plugs a memory leak. Change-Id: Ic989a89353d10de6f8f07df6a734d2b912facb7e Reviewed-on: https://code.wireshark.org/review/22305 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21Qt: Write a list of profile files at startupStig Bjørlykke3-0/+40
This file will contain all personal config files which will be fetched from a profile. Change-Id: I430ca84ccefc17f0e21c8efb93a92602ab8d5661 Reviewed-on: https://code.wireshark.org/review/22303 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21http: fix handling of HTTP responses followed by proxy responsesPeter Wu1-1/+1
Reused TCP connections with multiple HTTP requests/responses (in particular: HTTP request/response and HTTP proxy request/response) exhibit the following problem: the first response sets "startframe" such that the proxy response accidentally assumes that the proxy response starts in that first response. Fix this by only setting startframe if there is actually a transport upgrade. Tested with original capture and the Websocket dissection still works while Christian's capture has no longer the reported problem. Change-Id: I8a7878b9a2a98878a9e5be4f680d4f109fd8ab55 Fixes: 94ae27661e80 ("WebSocket dissector improvements") Reported-by: Christian Landström Reviewed-on: https://code.wireshark.org/review/22294 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21ISIS LSP: fix wrong bitmask for SPVIDAlexis La Goutte1-1/+1
Issue reported by Bo-Han Liao Bug: 13821 Change-Id: I74641bef723e747bfe5fa87e946b7f4f74b94bf6 Reviewed-on: https://code.wireshark.org/review/22299 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-21GSM SIM: define a dissector for both request and responseMartin Kaiser2-7/+17
Define a dissector that can handle both requests and responses. Look at pino->p2p_dir to detect if we have a request or repsonse. (At the moment, there's a dissector for request+response in one packet and two other dissectors for request and response messages.) Use the new mechanism for USB CCID. Change-Id: I7eb9861802b4244f92770602179f39642eb28641 Reviewed-on: https://code.wireshark.org/review/22289 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-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>
2017-06-21cmake: allow building from a UNC source directoryMartin Kaiser2-4/+2
Make two minor adjustments to allow building on Windows when the source directory is specified in UNC notation (\\server\volume\directory) instead of mapping such a directory to a drive letter. Cmake's add_custom_command() calls "cd <work_dir>" if a working directory is define as part of the rule. However, cd \\server\volume\directory is not allowed. Modify the two occassions where the working directory is derived from CMAKE_SOURCE_DIR. For copying some install files, we can get away with using the absolute path for each source file to be copied. The perl script that creates the tap listing for lua does not depend on a working directory at all. We can simply remove the WORKING_DIRECTORY parameter. Change-Id: Iac8e0addc44650692c1263fdca11f68315f50c63 Reviewed-on: https://code.wireshark.org/review/22236 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-21USB CCID: unify the code to call subdissectorsMartin Kaiser1-49/+37
Prepare the USB CCID code for replacing the "next protocol" preference with Decode As. USB CCID has a length field for the payload data. Use this field to create the next_tvb. There's no need for different payload lengths depending on the next protocol. Use call_data_dissector() instead of referencing data_handle. Set pinfo->p2p_dir regardless of the next protocol. Change-Id: I042ecc9bd75245ee1d4d8a94532c9fd1de83e859 Reviewed-on: https://code.wireshark.org/review/22288 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
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>
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>
2017-06-20packet-xml: Add 3GPP, ETSI, GSMA and OMA media typesVasil Velichkov1-0/+59
Not all media types are IANA registered https://www.iana.org/assignments/media-types/media-types.xhtml http://www.gsma.com/newsroom/wp-content/uploads/IR.95-v2.0-3.docx http://www.openmobilealliance.org/release/XDM/V2_2_1-20170124-A/OMA-ERELD-XDM-V2_2_1-20170124-A.pdf Change-Id: I7e2e1ef5ddcff91f04655d84836e10b9bf20d765 Reviewed-on: https://code.wireshark.org/review/22273 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-20Fix Toggle indicator for searchRoland Knall1-3/+0
Removing the toggle indicator. Search behaves now the same as it does for e.g. in SublimeText Change-Id: I4523001b536caa116bcb989f0850aa769c6220f8 Reviewed-on: https://code.wireshark.org/review/22280 Reviewed-by: Roland Knall <rknall@gmail.com>
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>
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>
2017-06-20Manuf: Konica Minolta updates.Gerald Combs1-2/+1
Correct a couple of entries related to Konica Minolta. Change-Id: I3acea1cf7ab1ad9be5d1b367a1015f5205b9e80b Reviewed-on: https://code.wireshark.org/review/22268 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-20IPv4/IPv6 display filter fixes and testingSilvio Gissi3-10/+91
Removed 'len' from IPv4, not needed Added more test coverage for IPv6 in dftestlib Change-Id: I1ca80e2525f32f6095ad73352baba733f4694ced Reviewed-on: https://code.wireshark.org/review/22260 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
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>
2017-06-20ieee80211-radio: allow 0 duration and handle missing phy typeSimon Barber1-4/+14
Allows duration to be calculated to 0 Handles generators where PHY type is not reported, but it can be determined from the rate. Change-Id: Ic0b9e1b0e3e51f4d5b670d25fea064daf250a55f Reviewed-on: https://code.wireshark.org/review/22261 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-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>
2017-06-20mq: start removing some if (tree) checksMartin Kaiser1-280/+202
There are lots of if (tree) checks. Start removing some which are obviously unnecessary. Change-Id: I3f8e4b82cd84d8e92ae79492d705438e2df739bb Reviewed-on: https://code.wireshark.org/review/22238 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-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>
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>
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>
2017-06-20mq: don't THROW() an exception from a dissectorMartin Kaiser1-1/+1
We can simply stop the dissection and exit. Change-Id: Ida8895513a1949fe5826ab89ffec2168642a9e89 Reviewed-on: https://code.wireshark.org/review/22237 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-19RLC: Renamed U-RNTI to UE IDDarien Spencer8-35/+42
The 'U-RNTI' field in RLC Info struct is both used in the code and shown in the UI as a generic unique 'UE ID' (not specificly U-RNTI, although sometimes it is) This commit renames the field to fit it's usage. Change-Id: Ib42b8ed5192fe60c9a164d6d225634be53708c66 Reviewed-on: https://code.wireshark.org/review/22225 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>
2017-06-19Update the capture file load time each time we update the progress bar.Jeff Morriss3-2/+4
The Qt UI doesn't have a popup that tells you how long your file has been loading. So let's set the load time each time we update the packets bar. (Obviously this is only useful when you're waiting a long time for a file to load...) Change-Id: I9da372800a12454888439e2baf3d2a848c611501 Reviewed-on: https://code.wireshark.org/review/22234 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-19AMQP: 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>
2017-06-19MQ: 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>
2017-06-19X11: more sanity checks for BIG-REQUESTS messagesPascal Quantin1-3/+12
Check that we do not have any overflow when converting words to bytes Bug: 13810 Change-Id: I43604f7bab427fc542c281e386ab9b994338366d Reviewed-on: https://code.wireshark.org/review/22227 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-19PROFINET 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>
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>
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>
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>
2017-06-19SearchBar - 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>
2017-06-19Attempt to clean up addr_resolv flags by removing DUMMY_ADDRESS_ENTRYAnthony Coddington5-31/+20
Replace with easier to understand and already present NAME_RESOLVED given dummy address is always filled. Change-Id: If8464f89e88722aac70689749fe0d4a31c119db2 Bug: 13798 Reviewed-on: https://code.wireshark.org/review/22110 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-19Remove unnecessary volatile qualifiersAhmad Fatoum2-5/+5
Change-Id: Ieebb199e181251fd0730dbabb4b8e71d6ad46a6d Reviewed-on: https://code.wireshark.org/review/21973 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-19FP: Fix out of bounds error in heuristic PCH dissectorDarien Spencer1-0/+5
Heuristic PCH dissector was trying to access the packet's header (4 bytes) without asserting these bytes exist Change-Id: Id2747e00ed353b1962293b3cd3ea6fbe9449a81d Reviewed-on: https://code.wireshark.org/review/22220 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-19[UMTS RLC] Rename proto variableDarien Spencer8-61/+61
To match the recently renamed file name. Change-Id: Id784b955ec96a52a5f380d415094dce81e1774d5 Reviewed-on: https://code.wireshark.org/review/22222 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-19zbee-zcl-se: Implemented zigbee zcl se metering dissectorMartin Boye Petersen1-10/+417
Implemented dissector to parse zigbee commands within SE metering cluster Change-Id: Iffb179c3e6db88b91b9ec96ed4d4b12bbeac682e Reviewed-on: https://code.wireshark.org/review/22221 Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com> 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-06-19Misc 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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-21 14:53:10 +0000