summaryrefslogtreecommitdiff
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-11-28Diameter: check IPv6 prefix length before copying it in e_in6_addr structurePascal Quantin1-2/+8
Bug: 11792 Change-Id: I37a07044d40f10e9a1a90025d90753fdb3db2278 Reviewed-on: https://code.wireshark.org/review/12248 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit aaa28a9d39158ca1033bbd3372cf423abbf4f202) Reviewed-on: https://code.wireshark.org/review/12251
2015-11-28Add boundary check for 802.11 decryptionPeter Wu2-2/+10
Fixed stack-based buffer overflow when the frame length exceeds 8KB. Bug: 11790 Change-Id: I20db8901765a7660e587057e955d4fb5a8645574 Reviewed-on: https://code.wireshark.org/review/12237 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 40b283181c63cb28bc6f58d80315eccca6650da0) [resolved conflict by accepting comments from v2.1.0rc0-764-g9cd66b2] Reviewed-on: https://code.wireshark.org/review/12246
2015-11-27Fix display of bytes as EBCDICPascal Quantin2-3/+4
MSVC compiler does not support properly setting an enum being part of a bit field. For example the following code: pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC; changes pinfo->fd->flags.encoding from 0x0 to 0xfffffffe instead of 0x1 Let's put back an unsigned int definition (like it is in master-1.12 branch) and add explicit casts where required Bug: 11787 Change-Id: Idae0140fb6c172f1b3dbf10baefc8cfb00128f4c Reviewed-on: https://code.wireshark.org/review/12220 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 62b03da49a3e6c32f788da375faea2ca47fa2aa9) Reviewed-on: https://code.wireshark.org/review/12229
2015-11-27[LDAP] Bugfix counting of search results.Michael Mann1-3/+3
Bug: 11761 Change-Id: Icd955b848edc9f802331f25ab1b8684aa2631553 Reviewed-on: https://code.wireshark.org/review/12184 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 c51f207308d04bda005f84828b59cec4104e4b8f) Reviewed-on: https://code.wireshark.org/review/12216
2015-11-26Don't allow the "Ethertype" pseudo-protocol's dissection to be disabled.Guy Harris1-0/+2
It's not a real protocol, it's a helper dissector for various protocols, and it makes no sense to disable it; doing so means that the Ethertype field itself isn't disabled, and allowing it to be disabled means that you can't do "Disable All", and manually enable Ethernet, IPv4, IPv6, and TCP to disable dissection of protocols running atop TCP on Ethernet. (See https://ask.wireshark.org/questions/48011/enabled-protocols-negation-of-disabled-proto for an example of somebody who wants to do exactly that.) Change-Id: Ibdd6ef53503de548e14cecc3766040c3a0b101d4 Reviewed-on: https://code.wireshark.org/review/12207 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 677faf2bd4bf233a7d8243b5c5abccf3111cfc5c) Reviewed-on: https://code.wireshark.org/review/12208
2015-11-26Wrong field name for signal strength as a percentage.Guy Harris1-1/+1
Copy-and-pasteo. Change-Id: I42ba4f172f9b837f01d3b30f2d14e7ee066f3e83 Reviewed-on: https://code.wireshark.org/review/12203 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e988e1c76488e5e8ee685ca0dca62578120f1467) Reviewed-on: https://code.wireshark.org/review/12204
2015-11-26Lua: Switch URL to documentation to HTTPSUli Heilmeier1-2/+2
URL to documentation with https as suggested by Alexis. (s. commit ecc9c74326183e8d03eddfdbc1557919f3be6046) Change-Id: I64d82b0c07cce5658eb8f4ae758f1a42946b837a Reviewed-on: https://code.wireshark.org/review/12181 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit ff5719c6e846c2d699c27f972ef5af4740a7a74c) Reviewed-on: https://code.wireshark.org/review/12191
2015-11-26Change TCP transmission window full messageMichael Mann1-1/+1
Bug: 11741 Change-Id: I2b3adc82bc44fd4e83e6f04b7e9bdcfaadf1b445 Reviewed-on: https://code.wireshark.org/review/12180 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 986a870145903e1b752711a47ac53d9eb0c85cde) Reviewed-on: https://code.wireshark.org/review/12189
2015-11-26L2TP: Correct L2TP over IP SHA1 message digestNicolas S. Dade1-1/+1
It should match the MD5 code, and skip over the 0x00000000 session id at the start of tvb. Change-Id: Ia3bee2bd07015523acc49bd7cb0247c3f1ac986e Reviewed-on: https://code.wireshark.org/review/12168 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 97e627e56d98bc45cd87cf629617c0dbd1798f6b) Reviewed-on: https://code.wireshark.org/review/12176
2015-11-26SCTP: add another NULL dereference checkPascal Quantin1-6/+8
This is a follow-up of g2259bf8 Change-Id: I4dfb839fcd016a8d7a7210e6358d230025eb96a3 Reviewed-on: https://code.wireshark.org/review/12171 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 1b32d505a59475d51d9b2bed5f0869d2d154e8b6) Reviewed-on: https://code.wireshark.org/review/12172
2015-11-26ISUP: fix a wrong removal of proto_tree_add_text()Pascal Quantin1-11/+3
Bug: 11768 Change-Id: I42199f391f6559de88ce37104bd74a9f4be77e09 Reviewed-on: https://code.wireshark.org/review/12149 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 b1044d6553241aa10189ff1fc064702c767a09b8) Reviewed-on: https://code.wireshark.org/review/12163
2015-11-26SCTP: verify frame pointer before dereferencing itPascal Quantin1-6/+8
Bug: 11767 Change-Id: Icd01550e0aaa4cd0cc33ae3acc0ef702c38f4db4 Reviewed-on: https://code.wireshark.org/review/12146 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 2259bf8a827088081bef101f98e4983de8aa8099) Reviewed-on: https://code.wireshark.org/review/12158
2015-11-25Fix buffer overrun in zlib decompressionPeter Wu1-3/+6
After updating next_in (to remove the gzip header), avail_in must also be updated. Failing to do makes zlib read past the input buffer. In theory this would resukt in a buffer overrun of at most double the input length, in practice zlib returns as soon as the compression fails (after reading a few bytes). Bug: 11548 Change-Id: If71691a2846338f46d866964a77cc4e74a9b61dd Reviewed-on: https://code.wireshark.org/review/12038 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 cec0593ae6c3bca65eff65741c2a10f3de3e0afe) Reviewed-on: https://code.wireshark.org/review/12137
2015-11-25Lua: fix URL to documentationUli Heilmeier1-1/+1
The Lua reference has been moved from User's Guide to Developer's Guide. Change-Id: I3489d774e54310ce49997e33d5318adf5e0bb2bc Reviewed-on: https://code.wireshark.org/review/12128 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit ecc9c74326183e8d03eddfdbc1557919f3be6046) Reviewed-on: https://code.wireshark.org/review/12129
2015-11-24Fix indentation.Guy Harris1-1/+1
Change-Id: I2a64b9919d257ee0f7a57ba40c33bea1690ae0ad Reviewed-on: https://code.wireshark.org/review/12087 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-24Check *how many* fields sscanf() found.Guy Harris1-31/+82
In the code that parses a GeneralizedTime field, don't assume that all fields were found; check the return value from sscanf(). This should clean up a fuzz failure on the 2.0 buildbot: https://buildbot.wireshark.org/wireshark-2.0/builders/Fuzz%20Test/builds/13/steps/valgrind-wireshark/logs/stdio Change-Id: I431d7ed69ac1697bd42c22a37ca1451cfc85c94e Reviewed-on: https://code.wireshark.org/review/12083 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 921bb07115fbffc081ec56a5022b4a9d58db6d39) Reviewed-on: https://code.wireshark.org/review/12084
2015-11-23HiSLIP: remove a DISSECTOR_ASSERTPascal Quantin1-7/+6
It should not be used for request/response tracking Change-Id: Ic93884cad5bcea40e082081097575908011871c8 Ping-Bug: 11752 Reviewed-on: https://code.wireshark.org/review/12063 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 8fa938d27b7388e6b5881718d45abd3315a0583c) Reviewed-on: https://code.wireshark.org/review/12071
2015-11-23RADIUS: fix wrong offset for protocolAlexis La Goutte1-1/+2
Only work for IPv4 (Missing length of IPv6) Bug:11630 Reviewed-on: https://code.wireshark.org/review/12057 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> (cherry picked from commit dee3b8057ffdba29b812856b7ce5b4b5cdbed866) Conflicts: epan/dissectors/packet-radius.c Change-Id: I5436aa8dc66897472466ca9399c34457f1afa851 Reviewed-on: https://code.wireshark.org/review/12062 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-23Qt: Set tooltip for packet list headerStig Bjørlykke2-0/+38
Added get_column_tooltip() to use common code in GTK and Qt. Change-Id: I2f6ce95e2e129752bbb958a28aec6f42aa81be3d Reviewed-on: https://code.wireshark.org/review/12047 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-on: https://code.wireshark.org/review/12055 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-22SCSI: Fix mixed up SCSI senddiag PF valuesStefan Pöschel1-1/+1
Change-Id: I5e4b3ff0579789d81bf4eaad3dc2669472d22dd7 Reviewed-on: https://code.wireshark.org/review/12024 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 26366ef795739920c858f5b7459476dc56677410) Reviewed-on: https://code.wireshark.org/review/12027
2015-11-21Lua: Validate Proto() argumentsStig Bjørlykke3-4/+33
Check if description (protocol name) and short_name are used before registering the protocol. This because proto_register_protocol() makes sure there's not already a protocol with any of the names registered and duplicates will be reported with a g_error() which terminates the Wireshark unexpectedly. Also check if short_name contains valid characters. Give appropriate error messages. Bug: 11739 Change-Id: Ib9776a2a3406ae5278ce744defd61864ebed0282 Reviewed-on: https://code.wireshark.org/review/11995 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-on: https://code.wireshark.org/review/12019
2015-11-21Set major SO versions for release in CMake and debian/Balint Reczey1-1/+1
Also fix debian/*.symbol file contents Change-Id: I8c14aa69a04cc30d5667110ed31fdcef3baaf4aa Reviewed-on: https://code.wireshark.org/review/11973 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-21usbvideo: fix Malformed packet error for SET_CURPeter Wu1-4/+0
The SET_CUR request does not have an extended pseudo-header, the logic likely refers to the extra bytes in the usmon packet header. Remove it since the function handles the payload after that header. Tested with arkmicro_webcam.pcap (from bug 8414) and usb-malformed-error.pcapng.gz (from bug 11736). Bug: 11736 Change-Id: I61c71bb06c37a626260447f703a5cc4db2a6fc80 Reviewed-on: https://code.wireshark.org/review/12005 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-20Qt: Fixed column issues when changing profile.Stig Bjørlykke1-13/+14
Always initialize prefs.col_list in pre_init_prefs. When switching to a profile without a saved 'preferences' file we have to initialize prefs.col_list to default values to avoid reusing settings from the profile we leave. This was introduced in 5012cf84e6d84a448171dac64c14d9c83e3d4ae6 Emit columnsChanged() before preferencesChanged(). This because columnsChanged() rebuilds cap_file_->cinfo which is used in preferencesChanged() to align columns (and possible other actions). Doing this in the wrong order will give an inconsistency and a heap-buffer-overflow if having different number of columns. Bug: 11493 Change-Id: I5792dfc0ede11b9457b96f092af8da00453787b1 Reviewed-on: https://code.wireshark.org/review/11971 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 0ae19656e12089271ea5941bcb4663bedc337b69) Reviewed-on: https://code.wireshark.org/review/11986
2015-11-20More spelling fixes found by lintianBalint Reczey23-26/+26
Change-Id: Id218dec9e5a721d6c63fd34962ffe50b6ab8dd56 Reviewed-on: https://code.wireshark.org/review/11946 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Diederik de Groot <dkgroot@talon.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit c297df134b4ba7afc84272a8c425a852e4b5408a) Reviewed-on: https://code.wireshark.org/review/11974
2015-11-19Fixing picosecond timestamp for vrt protocol. Needs to be parsed as uint64 ↵Nick Bedbury1-1/+1
not double Change-Id: I4c3cf4aa84a9208c382fa4a50ca3c2ffb1773ead Reviewed-on: https://code.wireshark.org/review/11962 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 1a841483e9df85f913ece0286a6e0d4f97a859c2) Reviewed-on: https://code.wireshark.org/review/11964
2015-11-19NWP: use col_add_str to set COL_INFOPascal Quantin1-1/+1
As indicated in column-utils.h, col_set_str should only be used for const strings Bug: 11726 Change-Id: I4774aac7dfba3c0f27ed90f8a4634fa19595eacb Reviewed-on: https://code.wireshark.org/review/11958 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 9b2c889abe0219fc162659e106c5b95deb6268f3) Reviewed-on: https://code.wireshark.org/review/11960
2015-11-182.0.0 → 2.0.1.Gerald Combs2-2/+2
Change-Id: I29a71f3bc76eb1fdc226c9f340c45fb3bcf7dffc Reviewed-on: https://code.wireshark.org/review/11955 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-18Export the value_string array ip_proto_val_ext for usage in pluginsJo Rueschel1-1/+1
Until now, it is not possible to use the IANA-assigned protocol values in a Wireshark plugin. This commit exports them for use on Windows machines. As discussed on http://seclists.org/wireshark/2015/Nov/88 Change-Id: I22adc33accf5d776bd3e5cc0899d3c5b9e9d531c Reviewed-on: https://code.wireshark.org/review/11874 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 92bb13a4d22a48c43aa5fa6910c68829edebfdd0) Reviewed-on: https://code.wireshark.org/review/11933
2015-11-17Lua: Do not deregister Listener in __gc.Stig Bjørlykke1-10/+5
Listeners should not be deregistered in __gc because they will go out of scope while in use. Instead free allocated data when deregistering the Listener (Listener.remove() and Reload Lua Plugins). Bug: 11722 Change-Id: Iadf6506757df06e476ac3cac38c05f1d1d497dc4 Reviewed-on: https://code.wireshark.org/review/11924 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 8383cb923b63535b46d52f00f430f784cbbb9014) Reviewed-on: https://code.wireshark.org/review/11925
2015-11-16For now, call the finish routine in Lua file writers "close".Guy Harris2-8/+8
If we ever change the way file writers work, in a fashion incompatible with the existing way they work, we'll also rename this member - and get rid of checks for earlier versions of the Lua interface. Change-Id: I64065944fa31371f5249cafd930c18f180ad7299 Reviewed-on: https://code.wireshark.org/review/11879 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 95fd55e56ba39b3b3b844a7ff65a418eced62ab2) Reviewed-on: https://code.wireshark.org/review/11880
2015-11-16ssl: add expert info for session resumptionPeter Wu4-79/+81
Add expert info to the Change Cipher Spec tree when session resumption is detected. This can be used as hint that decryption using a RSA key file will not succeed because of missing key material. The name of this expert info is "ssl.resumed" or "dtls.resumed" and the expert info message is "This session reuses previously negotiated keys (Session resumption)". Change-Id: I4a83edb13417631c97d6cfc4a57e2086bd217878 Reviewed-on: https://code.wireshark.org/review/11583 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 e0cf8b6ccfdde4a256645979f39b2e46b92e963c) Reviewed-on: https://code.wireshark.org/review/11866 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-16ssl-utils: add versions to ssl debug logPeter Wu4-24/+23
Add Wireshark/GnuTLS/Libgcrypt versions to the debug log file. Remove ssl_lib_init since it didn't do anything useful (the debug file was not open yet so it would write... nothing). Match more (EC)DH(E) cipher suites and try to improve the message. Add the human-readable name besides numeric cipher suite IDs. Change-Id: I84a33d270f91e90efc55371475b231b483fd24c9 Reviewed-on: https://code.wireshark.org/review/11403 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 07ceb2c6dc5167bc2fe8f1f000c3a3d64571396e) Reviewed-on: https://code.wireshark.org/review/11865 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-15tcp: Indicate number of bits used for Flags.Stig Bjørlykke1-1/+1
Change-Id: Iac003993e820e3ad5ecbe2c9322bce1957a14c25 Reviewed-on: https://code.wireshark.org/review/11855 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 6012ba8f008bfba24fd44ce7a2a3055572453dce) Reviewed-on: https://code.wireshark.org/review/11856
2015-11-15tcp: Revert back to the old Flags entry.Stig Bjørlykke1-2/+2
A similar issue was discussed and fixed for IP Flags in d051e79a (svn revision 33264). Change-Id: I532f51e813aee707b9573537cb8fbdb823158a61 Reviewed-on: https://code.wireshark.org/review/11817 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 2db454361d4115caaf08b8c1df57f05ee1c0694e) Reviewed-on: https://code.wireshark.org/review/11854
2015-11-15Lua: Fixed some argument # in argument errors.Stig Bjørlykke1-4/+4
Change-Id: I1dba41c9f129d368096dd69a0f40fa2164311124 Reviewed-on: https://code.wireshark.org/review/11852 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 561bcff0270106226bc8fb6ae49c54e407d06f46) Reviewed-on: https://code.wireshark.org/review/11853
2015-11-15Lua: Check for nil valuestring for integer fields.Stig Bjørlykke1-1/+1
Added a check for nil valuestring for all ProtoField integer types to avoid lookup when argument is not set. Change-Id: Ib4c016b69ee77dbea4bb83ac93c0d9ae9f48f236 Reviewed-on: https://code.wireshark.org/review/11845 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit a8e774034b188662f29a41e3ff86ec96068bd025) Reviewed-on: https://code.wireshark.org/review/11846
2015-11-15Lua: Added support for ProtoField framenum type.Stig Bjørlykke5-7/+46
Change-Id: I1d4cddd4026f08416005f2b3212536b3984d1a8d Reviewed-on: https://code.wireshark.org/review/11834 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 e6b5f015e219f3968897adba0d6440945ff45b8e) Reviewed-on: https://code.wireshark.org/review/11844
2015-11-15udp: Don't mark zero checksum illegal when in_error_pkt.Stig Bjørlykke1-1/+1
A zero checksum is not illegal in IPv6/UDP when in a ICMPv6 packet. Change-Id: I07acc874d2385992089ef3ebc7a82e853904ecfc Ping-Bug: 6232 Reviewed-on: https://code.wireshark.org/review/11808 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 82bd3cc9eb49c886a1b6ff1ad0aa3be096bd8aec) Reviewed-on: https://code.wireshark.org/review/11843
2015-11-15[Automatic update for 2015-11-15]Gerald Combs2-2/+17
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icec0d139c9c72bfd56751f75e0ccca38eaa8d9c6 Reviewed-on: https://code.wireshark.org/review/11839 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-14Lua: Disallow ProtoField FRAMENUM to fetch from Tvb.Stig Bjørlykke1-0/+4
A ProtField type FRAMENUM cannot fetch value from a Tvb. Change-Id: Iff0f6df8b00445855c9030dcfa753daa62262171 Reviewed-on: https://code.wireshark.org/review/11832 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 13101020e12eb21e8464a3c4eb4fc2fe51409235) Reviewed-on: https://code.wireshark.org/review/11833
2015-11-14p_mul: Fixed ack framenum links.Stig Bjørlykke1-3/+11
The ack symbol is for the Address PDU beeing acked. Also use the DUP_ACK symbol for P_Mul's Ack-Ack. Change-Id: I3da616e95e9c2cf889b1e4e4c0570ab0c276a2d2 Reviewed-on: https://code.wireshark.org/review/11819 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 20388ef1742efde4ba2bf5cf19814ac5192a6ffc) Reviewed-on: https://code.wireshark.org/review/11823 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-14dmp: Fixed ack framenum links.Stig Bjørlykke1-4/+16
The ack symbol is for the Message, Report or Notification beeing acked. Change-Id: I5ef99b9e7830f437278af18e681f8200fab6c3d4 Reviewed-on: https://code.wireshark.org/review/11818 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 2e19755c3343d0a58f3d43709df262e4a0d4d8fd) Reviewed-on: https://code.wireshark.org/review/11822 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-13p_mul: Enhance ack framenum links.Stig Bjørlykke1-1/+1
Change-Id: I084b43fcd8419741c2de007bd03fc04532346813 Reviewed-on: https://code.wireshark.org/review/11797 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit acbf7d57253f4dc4206e3d67c0c56f6e28da6796) Reviewed-on: https://code.wireshark.org/review/11799
2015-11-13dmp: Enhance ack framenum links.Stig Bjørlykke1-1/+1
Change-Id: Iade2d06512bacbeff3e7446487a03d4f73dba721 Reviewed-on: https://code.wireshark.org/review/11796 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 89879ef9f9d1d89a3253b96c7c2b6ea606bbc851) Reviewed-on: https://code.wireshark.org/review/11798
2015-11-13Diameter: Expand an error message.Gerald Combs1-2/+2
If we encounter the wrong ftype, print its name. Change-Id: I7405ccdd3e099f533c6a8aaf81b60faf4093741a Reviewed-on: https://code.wireshark.org/review/11790 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit b01cd398f9efdff485e1658265a1c2046d6c0b94) Reviewed-on: https://code.wireshark.org/review/11794
2015-11-12[IMF] Add bounds checks to avoid buffer overruns,DiablosOffens1-4/+13
also sets the last_field flag to true if it's the end of the buffer. Change-Id: I135d052fce04807ce61b5feb9af121ff4528f595 Reviewed-on: https://code.wireshark.org/review/11731 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 56c1e80508f73b244c12b537223e777a253395f7) Reviewed-on: https://code.wireshark.org/review/11765
2015-11-12Use format_text() when displaying, not when handing to AirPDcap.Guy Harris1-16/+56
format_text() is specifically intended to handle strings when displaying them to the user; code such as AirPDCap, which doesn't display strings to the user, should be handed the raw SSID. Put in a comment indicating what we probably *should* be doing here. Bug: 11685 Change-Id: Ic30114c35d1d8f3d791ae904e33a4d81ddc215ec Reviewed-on: https://code.wireshark.org/review/11757 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e240ad882bc1e133e76b8308a76884d12b265253) Reviewed-on: https://code.wireshark.org/review/11758
2015-11-12802.11: avoid multi return on SSID or MESHIDAlexis La Goutte1-5/+5
Bug:11685 Change-Id: Ibe7a2909f0aed33fa35685ac5c8e0e1a8a626742 Reviewed-on: https://code.wireshark.org/review/11652 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 50e83c0e79efe69eb71a6645b67e761e263e44d6) Reviewed-on: https://code.wireshark.org/review/11756
2015-11-12Export functions str_to_ip() and str_to_ip6() to pluginsJo Rueschel1-0/+3
The functions str_to_ip() and str_to_ip6() are not yet exposed to plugins so they cannot be used there. Now they are added to the plugin API. Change-Id: I9df267934ad43887a6326c8c9a1a666f263c08a2 Reviewed-on: https://code.wireshark.org/review/11728 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 09f43c196e2c642e736b77f0a0fec924be096b7d) Reviewed-on: https://code.wireshark.org/review/11755
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-30 03:16:12 +0000