aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-10-08No RCS/CVS/SVN Ids any more.Guy Harris1-2/+0
Change-Id: Ia9057a1851be17238c35094f14e847b387943186 Reviewed-on: https://code.wireshark.org/review/10869 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-07Don't just ask for C, ask for standard C - preferably C99.Guy Harris1-1/+5
We're using some C99 features, such as variadic macros, so if there's a compiler flag needed for C99 features, make sure it's supplied. If the compiler doesn't support standard C, complain. Change-Id: I6fb18f5222567249370b3d43065f2258dbde7e4d Reviewed-on: https://code.wireshark.org/review/10866 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-07wslua: fix memleak in lua_prime_all_fieldsPeter Wu1-0/+1
Would leak some bytes after startup. Caught by LeakSanitizer. Change-Id: I4644f204343ce5a803a7dfdedac6a1960882807f Reviewed-on: https://code.wireshark.org/review/10859 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-07AMQP: Fix usage of p_(add|get)_proto_data.Petr Gotthard1-38/+29
The p_(add|get)_proto_data() functions are used to store data related to an AMQP frame. The stored information gets overwritten if there are multiple small AMQP frames in one TCP/IP packet. As suggested by Pascal and https://code.wireshark.org/review/#/c/10579/, we should use tvb_raw_offset as key for p_(add|get)_proto_data(). Change-Id: I860df8af51a6fbbef495985747313ae96402cc5c Reviewed-on: https://code.wireshark.org/review/10836 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: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-07IPv6: add changes forgotten in gbedda9bPascal Quantin1-3/+3
Bug: 11570 Change-Id: I5a8d89253becd550e0330c82ab0811c502db6d61 Reviewed-on: https://code.wireshark.org/review/10849 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-07Update last updated DNS parameters (2015-07-26)Alexis La Goutte1-15/+15
* draft-ietf-dnsop-delegation-trust-maintainance-14 => RFC 7344 Update also DNS-Based Authentication of Named Entities (DANE) Parameters ( 2014-04-23) (no change) Change-Id: I7aa7dddf8c26d2ea2ccb4a0533d835ce119737bd Reviewed-on: https://code.wireshark.org/review/10825 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>
2015-10-07DNS: Add DNS Cookie OptionAlexis La Goutte1-1/+25
draft-ietf-dnsop-cookies-05.txt Change-Id: Ife550d8fe0c6604329c78bb34e94276050148a8a Reviewed-on: https://code.wireshark.org/review/10824 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-07ssl-utils: load RSA keys based on their modulus+exponentPeter Wu7-215/+179
Load RSA private keys based on their public key instead of relying on the user to specify a valid address and port mapping. This is more reliable and prepares for simplification of the SSL Keys dialog. After this change, the "address" part of the UAT dialog will be ignored when loading the private key. The port+protocol mapping is still imported, but should probably be removed too. Change-Id: I4d7a2bfcf63d17e66e336ef770759f20510fc176 Reviewed-on: https://code.wireshark.org/review/10766 Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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>
2015-10-07ssl-utils: simplify private key storage, fix resource leaksPeter Wu4-178/+82
The certificate and GnuTLS private key are never used except for reporting in the log file. Remove the unused certificate-related code from the PKCS#12 file parsing. Report an immediate error instead of opening key file if GnuTLS is disabled. Made ssl_load_key and ssl_load_pkcs12 static, they are not used outside the SSL dissector. If for some reason the PKCS#12 bag contains multiple private keys, then the previous one would be overwritten (leaking memory). Fix this by returning the first private key found. Simplify key_hash (dtls_key_hash/ssl_key_hash) memory management, now the table automatically frees keys/values when items are removed. Fix memory leaks: - ssldecrypt_uat_fld_password_chk_cb: release ssl_load_pkcs12 memory. - ssl_load_key: avoid leaking gnutls_x509_privkey_t on error. - ssl_load_pkcs12: fix ssl_pkey leak on error path. Change-Id: I5db6fecb0d74e5c78796392aeb17e3eb7985a2ef Reviewed-on: https://code.wireshark.org/review/10764 Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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>
2015-10-07UDP: Refactor some dissector codeJoão Valverde2-120/+83
Add UDP length as a generated field of UDP-Lite subtree. Change-Id: I35291cc5f5b2a8909a7124cbae8c39fc91d7751d Reviewed-on: https://code.wireshark.org/review/10775 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-07Remove heur_dissector_set_enabled.Michael Mann2-33/+0
With the adjustment to heur_dissector_add passing an enable/disable flag and "global" control of heuristic dissectors just like regular ones, this is no longer needed. Change-Id: I2d433c7bff8353421eca31f8813992e38b716911 Reviewed-on: https://code.wireshark.org/review/10848 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>
2015-10-07BGP: Add BGP-Extended Message CapabilityAlexis La Goutte1-2/+4
From draft-ietf-idr-bgp-extended-messages Update BGP Capability Codes to 2015-09-30 Change-Id: I2f3b44ad8ad7a9e5444cdfbfb22bf7d0538ffbfc Reviewed-on: https://code.wireshark.org/review/10826 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-06CMake: Don't clobber ZLIB_*.Gerald Combs1-38/+41
On Windows we set a few (but not all) ZLIB_* variables, then depend on FindZLIB to fill in the rest. Make sure FindZLIB doesn't unset everything the first time we run CMake. Bug: 11569 Change-Id: I199c83570c29343466b9ff63080b6a964dfd8d73 Reviewed-on: https://code.wireshark.org/review/10843 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-06SCTP: fix dissection of DATA chunksPascal Quantin1-1/+1
Regression introduced in gd52322e Change-Id: I57baf53d81c7e95ea8ad15e4799033d341e4ee61 Reviewed-on: https://code.wireshark.org/review/10845 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-06Report an error if we don't find fop and are going to try to use it.Guy Harris1-0/+3
Change-Id: Ide5c43b797a2fa07c7d3c7f986d306a158d68c6b Reviewed-on: https://code.wireshark.org/review/10840 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 6c45d217d9d4fbf2a4dbc17d0b92334e3bc93052) Reviewed-on: https://code.wireshark.org/review/10841
2015-10-06Fix an I/O graph crash.Gerald Combs2-34/+11
QTreeWidget::removeItemWidget calls QAbstractItemView::setIndexWidget, which deletes the current item widget. As a result we shouldn't try to delete itemWidgets ourselves. Add a note explaining why we use hand-crafted item widgets instead of a custom item delegate. Bug: 11449 Change-Id: I485bacc0fae60ea3174e003ef0032948ee5c720f Reviewed-on: https://code.wireshark.org/review/10820 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-06[NSIP] Wrong offset used for proto_tree_add_bitmask() for the reset flag.AndersBroman1-2/+2
Change-Id: Ica9ed514e593079ba4cb287d4165eb6e967ec903 Reviewed-on: https://code.wireshark.org/review/10833 Petri-Dish: Anders Broman <a.broman58@gmail.com> 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>
2015-10-06openSAFETY: Add Producer ID to info fieldRoland Knall1-8/+28
Cosmetic change, to better distinguish if multiple SPDO packages have been detected. This should also be back-ported to 1.12 and 2.0 Change-Id: I3d0b26ecb6e0cc60b3cdc9861920c5ccaeb70cbd Reviewed-on: https://code.wireshark.org/review/10829 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-06Remove an extra commaPascal Quantin1-1/+1
Change-Id: I14e89d9db53166b43ef6bee901ba0fdc545657b1 Reviewed-on: https://code.wireshark.org/review/10831 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-06Fix SoupBinTCP sequence number tracking.David Arnold1-3/+6
Change-Id: Ia31b21894a6f0ba2da6cc2aea6babda9f37f5e09 Reviewed-on: https://code.wireshark.org/review/10579 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-06Calculate the channel if we have only the frequency.Guy Harris2-0/+14
That way, the generic 802.11 radio dissector, and any future taps if we add a tap with radio information, can get the channel for radiotap and PPI headers, as we do for some other radio headers that supply just a frequency. Change-Id: I9e3037f69938bed3b3ba563689ff00aaed486a16 Reviewed-on: https://code.wireshark.org/review/10821 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-06Qt: refine some strings for l10nYFdyh0007-8/+8
Change-Id: I460559c99c79c9fd40f284c750d64210fe5de50b Reviewed-on: https://code.wireshark.org/review/10813 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>
2015-10-05Show progress in the Supported Protocols dialog.Gerald Combs1-1/+2
Make sure we update the UI when building our tree. Change-Id: I8b24e5c017c9521a00e3dfcb48afe0e6b6124aa2 Reviewed-on: https://code.wireshark.org/review/10806 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05debian: Build .debs with Qt 5Balint Reczey2-3/+3
Change-Id: I085d5332a0a1c8151b5781c0a94cffe2fe32aeb7 Reviewed-on: https://code.wireshark.org/review/10800 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-10-05Initialize 2.1.Gerald Combs11-20/+20
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Fix capitalization in MATE's "you need to restart to reconfigure" message.Jeff Morriss1-22/+37
Fix up some formatting and white space while we're there. Change-Id: I869659d6fb1f8b4946f6e13a928ecd53dbabf1a4 Reviewed-on: https://code.wireshark.org/review/10807 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-05MATE: Add ~ operator supportMichael Mann1-2/+1
Bug: 9025 Change-Id: Ica92a7026ba8a89a8970b76e4e7d27f9e6288eb6 Reviewed-on: https://code.wireshark.org/review/10760 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-05Qt: fix crash when double clicking on a row in 'Decode As' dialogPascal Quantin2-22/+2
No need to register for the destroyed() signal: it is emitted after the new QComboBox object is created and resetting pointers to NULL is useless as they are locals initialized in the constructor Bug: 11532 Change-Id: Ie707cafa370053df846a4732aed20c182e030c40 Reviewed-on: https://code.wireshark.org/review/10792 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Add BASE_PT_ field display typesJoão Valverde9-123/+149
Avoid displaying duplicate port numbers with transport name resolution disabled and make some dissector code simpler. Introduces port_with_resolution_to_str_buf() function and amends UDP/TCP/DCCP/SCTP to use the new field display type. Change-Id: Ifb97810b9c669ccbb1a310a2c0ffd6e2b63af210 Reviewed-on: https://code.wireshark.org/review/10625 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05SCTP I-DATA supportruengeler10-89/+281
Change-Id: I459942b9e3287d500dda517568252d4cb56d3216 Reviewed-on: https://code.wireshark.org/review/10802 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Michael Tüxen <tuexen@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2015-10-05Make the capture comment icon more Wireshark-y.Gerald Combs4-0/+932
Change-Id: Ic693c7afc1658c3b89ae5cddf9c7ab32c435cf2e Reviewed-on: https://code.wireshark.org/review/10788 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: Gerald Combs <gerald@wireshark.org>
2015-10-05Fix initialization order.Gerald Combs1-2/+2
Change-Id: I5eb59108860c9282d798aedfe40eccf1ee85658d Reviewed-on: https://code.wireshark.org/review/10805 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05H225, H245 over IPv6Michal Pazdera5-107/+223
This commit extends h225 and h245 dissectors to support dissection of ipv6 packets. Change-Id: Id8c045344711a96f15d619ddd72065aa3712c429 Reviewed-on: https://code.wireshark.org/review/10799 Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com> 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>
2015-10-05Move utf8_entities.h to wsutilJoão Valverde64-81/+68
Change-Id: I6298b3de5f0a1cb988014ff16082eaf8c2a3c3c0 Reviewed-on: https://code.wireshark.org/review/10786 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>
2015-10-05Don't count packets twice for average using avg_stat_node_add_value_notick.Michael Mann1-4/+0
Bug: 10535 Change-Id: I9c61a1f10f257bc6dd390c2a9370653bbd45b205 Reviewed-on: https://code.wireshark.org/review/10772 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05file.c: fix resource leak reported by Coverity (CID 1159387)Pascal Quantin1-1/+1
Change-Id: I24f85f41bcb0c3a0dda0b6658dbfdb4098eb64b9 Reviewed-on: https://code.wireshark.org/review/10796 Reviewed-by: Dario Lombardo <lomato@gmail.com> 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>
2015-10-05Qt: fix uninitialized members (UNINIT_CTOR) reported by Coverity (CID 1228882)Pascal Quantin1-1/+2
Change-Id: I1f09fa9a8421e702d2fff963afc899617f2e6222 Reviewed-on: https://code.wireshark.org/review/10794 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-05Qt: fix control flow issues (UNREACHABLE) reported by Coverity (CID 1224614)Pascal Quantin1-2/+0
Change-Id: I5e59490e0c913f4648fd1024bcf1792a936a39dd Reviewed-on: https://code.wireshark.org/review/10795 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>
2015-10-05AMQP: Fix warnings and the OSX 10.5 x86 buildPetr Gotthard1-3/+3
The AMQP channel number is 16-bit only. packet-amqp.c: In function 'dissect_amqp_0_9_method_channel_close': packet-amqp.c:8481: warning: cast to pointer from integer of different size packet-amqp.c: In function 'get_conversation_channel': packet-amqp.c:10512: warning: cast to pointer from integer of different size packet-amqp.c:10518: warning: cast to pointer from integer of different size Change-Id: I398ecfb19ecb7e741c2ed0675c1c625bf6a894f9 Reviewed-on: https://code.wireshark.org/review/10793 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>
2015-10-05Allow use of variadic macrosPeter Wu12-396/+333
Remove variadic macros restriction (c99, c++11 feature) from README.developer. GCC, Clang, MSVC 2005 all support it. Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when -Wpedantic is enabled (which would enable -Wvariadic-macros). For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by "FOO" and adjust the macro definition accordingly. The nbap dissector was regenerated after adjusting its template and .cnf file. The generated code is the same since all files disabled the debug macros. Discussed at: https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2 Reviewed-on: https://code.wireshark.org/review/10781 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-05Fix warnings introduced by "Qt: Initial RTP playback"Peter Wu6-17/+11
Change-Id: I28ae077be535f32ef81ac370d6782033f219017d Reviewed-on: https://code.wireshark.org/review/10777 Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05Fix typos in rtp_player_dialog filesYFdyh0002-2/+2
Change-Id: I0df33dc156601187a6a180d8786ef18c5c05467a Reviewed-on: https://code.wireshark.org/review/10787 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05AMQP: Navigation between publish/delivery and related ack/nackPetr Gotthard1-63/+339
This patch adds cross-references between publish/delivery and ack/nack frames. This improves user comfort when inspecting the traffic. Change-Id: I819b19474a3f0351eb769eadf3d32042cb5f5256 Reviewed-on: https://code.wireshark.org/review/10745 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05Qt: Don't update the recent list while capturing.Gerald Combs3-1/+17
If a recent file is on a network share we'll create traffic which can show up in the capture. This doesn't fix the issue entirely, e.g. if you're capturing in one instance of Wireshark and have another one open. The proper fix in that case is to switch to QFileSystemWatcher as described at the top of ::WiresharkApplication. Ping-Bug: 11546 Change-Id: If21f1bb213fe1d862c09b1b2edd78c8baf983461 Reviewed-on: https://code.wireshark.org/review/10774 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-10-05Remove tr() for setObjectNameYFdyh0002-4/+4
Change-Id: I4561ded123df3c2152da543e8a6786cb8b386dd5 Reviewed-on: https://code.wireshark.org/review/10790 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>
2015-10-05UDP: Make port column info similar to TCP, add length informationJoão Valverde4-11/+26
Change-Id: I3f7a35db53a1ecc9d543b80f143eb6082616e458 Reviewed-on: https://code.wireshark.org/review/10702 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-10-05wslua: fix crash when a LUA error is raised in TRY blockPeter Wu3-5/+33
The dissect_tcp_pdus function in LUA is passed two LUA functions that get the PDU length and the dissect a PDU. When one of these functions fail, a longjmp is made to the the caller of lua_pcall. This is no problem for the PDU length function, but the PDU dissect function is wrapped in a TRY/CATCH/ENDTRY block which also uses longjmp and need to be fully executed. Without doing so, LUA exceptions will crash on a weird location (except_pop). Fix the crash by not using luaL_error, but throw dissector errors which properly breaks out of the tcp_dissect_pdus C function and then convert it to a LUA error such that the dissector can handle it. Test with `tshark -X lua_script:crash.lua -r ssl.pcap`: trivial_proto = Proto("trivial", "Trivial Protocol") function dissect_foo(tvb, pinfo, tree) error("triggering a LUA error"); end function get_pdu_len(tvb, pinfo, tree) return 5; end function trivial_proto.dissector(tvb, pinfo, tree) dissect_tcp_pdus(tvb, tree, 5, get_pdu_len, dissect_foo) end tcp_table = DissectorTable.get("tcp.port") tcp_table:add(443, trivial_proto) It should not crash and will print this: Lua Error: dissect_tcp_pdus dissect_func: [string "crash.lua"]:3: triggering a LUA error Change-Id: Ibd079cc5eb3a2e4d2e62ea49a512fa2cc8e561ea Reviewed-on: https://code.wireshark.org/review/10685 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-10-05bacapp: attempt to fix windows buildPeter Wu1-1/+1
Reported by Graham: packet-bacapp.c(5299) : warning C4146: unary minus operator applied to unsigned type, result still unsigned Regression in v1.99.10rc0-330-g71ec57a ("bacapp: fix -Wshift-negative-value"). Change-Id: Ia3ea3acad3afdf7b8a449224c815ea45d7fdbc2b Reviewed-on: https://code.wireshark.org/review/10785 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-04UDP: Rename UDPlite to UDP-LiteJoão Valverde2-9/+9
Keep "UDPLite" in ipproto.c in accordance with the IANA Considerations section of RFC 3828. Change-Id: Icfa2bc07ea3c6782e838b4896f9e4aec28422d34 Reviewed-on: https://code.wireshark.org/review/10765 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: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-04Expand, correct, and otherwise improve comments.Guy Harris2-6/+89
Change-Id: Id33a1a66114f6b01d203ad717342ae90c12981cc Reviewed-on: https://code.wireshark.org/review/10789 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 01:21:53 +0000