summaryrefslogtreecommitdiff
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2017-06-22packet-mbtcp - Fix retrieval of Holding/Input Register Format PreferenceChris Bontje1-1/+1
Change-Id: I7a6a409df5c977db1898aec6a47ae3dd8427a00c Reviewed-on: https://code.wireshark.org/review/22286 Petri-Dish: 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 130b514be216e8ccc42c6831f62ecb23e9b83917) Reviewed-on: https://code.wireshark.org/review/22351
2017-06-22OSPF: Opaque ID is not longer be zeroAlexis La Goutte1-15/+0
With RFC7770 the Opaque ID for Router Information is not longer be zero Change-Id: I22f9917ac5b5b0261e36b1097765dab6ce216a46 Ping-Bug: 13823 Reviewed-on: https://code.wireshark.org/review/22329 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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> (cherry picked from commit 123d170767f6e51ce6b216d633fb03a3cf311109) Reviewed-on: https://code.wireshark.org/review/22348
2017-06-22IEC104: Added checking of correct ApduLen in context of ASDU typeJiří Engelthaler1-0/+19
Added displaying of raw data for unknown ASDU type Change-Id: I17e2ae048dbec61718610dd86d6878cdc0563ef0 Reviewed-on: https://code.wireshark.org/review/22341 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> (cherry picked from commit d2ed7fcf9e0dca17f1a0181364910b9533dc7091) Reviewed-on: https://code.wireshark.org/review/22345
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> (cherry picked from commit e46cb2defc559a530d11689d50f0adf47513e8e5) Reviewed-on: https://code.wireshark.org/review/22333
2017-06-21Lua: Add "tonumber" method to NSTimeSilvio Gissi2-3/+15
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> (cherry picked from commit 59add43eecfbed3bae5d75dabe6e875b5adefe1b) Reviewed-on: https://code.wireshark.org/review/22331
2017-06-21packet-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> (cherry picked from commit 3b7440996b2f3637656575ad121fa6edfa03cfcb) Reviewed-on: https://code.wireshark.org/review/22304
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> (cherry picked from commit 855484fbd98c8c01f5a84902243389e07e32b6e9) Reviewed-on: https://code.wireshark.org/review/22300
2017-06-21IEEE 802.15.4: Fix double offset increment for Time Correction Header IERobert Sauter1-10/+6
Regression by https://code.wireshark.org/review/21890/ Change-Id: Ieb90672dc2181f5951a8a4165e2676b7882282e5 Reviewed-on: https://code.wireshark.org/review/22087 Petri-Dish: 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 b8e660edc66d7f40545868a377b3385b4c9a54cb) Reviewed-on: https://code.wireshark.org/review/22298
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 Wu2-0/+27
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-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-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-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 Combs2-18/+278
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-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 Harris1-0/+2
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-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-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-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-11Ranap: improve heuristic algorithmMichael Mann2-6/+34
Strength the heuristic cheking PDU-Type and Criticality field values too # Conflicts: # epan/dissectors/packet-ranap.c Change-Id: Id95603634a93033664bdbd169880e6b411cfbc11 Bug: 13791 Reviewed-on: https://code.wireshark.org/review/22076 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> Reviewed-on: https://code.wireshark.org/review/22080 Petri-Dish: Michael Mann <mmann78@netscape.net>
2017-06-11Fix airpdcap compilation on SunPetr Sumbera1-0/+4
Bug: 13786 Change-Id: Iaa3890610768605b5c579aaddc73124b9f85bdd9 Reviewed-on: https://code.wireshark.org/review/22074 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 2073457ab9ef817a2342e3c4dd858b88198020e4) Reviewed-on: https://code.wireshark.org/review/22075
2017-06-11packet-spdy: Fix -Wunused-const-variable error when compiling without zlibRobert Sauter1-1/+1
Change-Id: Id471772488d3a0568f16f604585b3155a57e47b2 Reviewed-on: https://code.wireshark.org/review/22072 Reviewed-by: Anders Broman <a.broman58@gmail.com> 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> (cherry picked from commit 5617527ee3831a8012f076b67e2532eeb8b1da2d) Reviewed-on: https://code.wireshark.org/review/22073
2017-06-11[Automatic update for 2017-06-11]Gerald Combs2-25/+195
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I7fc53087dbb81293f8bd5f62e505f879896f668f Reviewed-on: https://code.wireshark.org/review/22068 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-10Put the non-filter part of epan/color_filters.h into wsutil/color.h.Guy Harris2-18/+4
Places that only need color_t, such as certain preferences, don't need the color filter stuff. Change-Id: I88fc2858454d04e659b323a8bc28b21d362ca3fb Reviewed-on: https://code.wireshark.org/review/22060 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 0480a0be81dd5c561637c8d6351191c154f72970) Reviewed-on: https://code.wireshark.org/review/22061
2017-06-09Handle filter open and read errors better.Guy Harris1-70/+67
If the user's color filter file exists but can't be opened, fail and return a failure indication. If it doesn't exist, just try reading the global color filter file. If *that* exists but can't be opened, fail and return a failure indication; if it doesn't exist, don't treat that as an error. Change-Id: I5ebdc0eb1ada3cc190990be9228639304f32147e Reviewed-on: https://code.wireshark.org/review/22054 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit ad4e81fcf869680b057651970fba38690e82c87d) Reviewed-on: https://code.wireshark.org/review/22056
2017-06-09ieee80211-radio: Fix calculation of frame start timeSimon Barber1-1/+1
With captures where TSF indicates the end of the frame the preamble was being counted twice in the calculation of the start. Change-Id: I3d042d8ea3bc46a833438cb3d2f75e3499a7711d Reviewed-on: https://code.wireshark.org/review/22020 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 33456f48ac9a3842e1eda8e179ae9d8bd4c33140) Reviewed-on: https://code.wireshark.org/review/22050
2017-06-08IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IEPascal Quantin1-22/+35
Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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 49a55b9666329971e2c17d69179c331160fa7b40) Reviewed-on: https://code.wireshark.org/review/22047
2017-06-08LTE RRC: fix filtering of q-RxLevMin parameterPavel Strnad2-3/+18
Ensure that filter as a different abbreviation depending on the technology used. Bug: 13481 Change-Id: I14782dffcf70bdb015fd705d2184ae8c42f232c5 Reviewed-on: https://code.wireshark.org/review/22039 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 3453a0b888a0e188c03012023a4e93d03764602c) Reviewed-on: https://code.wireshark.org/review/22041
2017-06-08export-smb2-objects: Make sure tap be called for named pipelinzhao1151-6/+8
smb2_eo_tap is not called when smb2 packets are dissected as named pipe then exit. Basically, for the following code snippet, if (length) { int old_offset = offset; ... offset = dissect_file_data_smb2_pipe(...); if (offset != oldoffset) { /* managed to dissect pipe data */ return offset; ... dissect_file_data_smb2_pipe() always returns a different offset, thus it will never hit the smb2_eo_tap related code below that are needed for exporting smb2 objects. As a quick fix, call the tap related code before returning. Bug: 13214 Change-Id: I7a99177947c384f53424b209f7e5c1f9963b5da8 Reviewed-on: https://code.wireshark.org/review/22031 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 411a5342c5d9f12651ed7c8d268597bdc3db9f4a) Reviewed-on: https://code.wireshark.org/review/22034 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-08wsmp: read the message length as big endianMartin Kaiser1-1/+1
We add the message length to the tree as big endian but we interpret it as little endian for our further calculations. This causes parsing errors. Use big endian for both cases. Bug: 13766 Change-Id: I4e6cdb7d4267be96ea78eb664e88c532a9a90b52 Reviewed-on: https://code.wireshark.org/review/22024 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit bd130766438546ab64f7540597a2e3b82cbf8a3c) Reviewed-on: https://code.wireshark.org/review/22028
2017-06-07ieee80211-radio: Fix description of packet start and end time fieldsSimon Barber1-2/+2
Change-Id: I8b0acaa689c468b6da553d47a15a9d47fe9d45a6 Reviewed-on: https://code.wireshark.org/review/22021 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 23a2f56b0fcfb72c183f0ace8f30e25400036408) Reviewed-on: https://code.wireshark.org/review/22022
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-21 14:06:17 +0000