aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-12-05Update a comment to reflect current reality.Guy Harris1-11/+15
Change-Id: Ied84e0363161ebc42c8cf24e7ade4b1b4e536448 Reviewed-on: https://code.wireshark.org/review/19074 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-05cmake: Fix building with plugins disabledPeter Wu1-6/+8
When Lua is enabled, scripts can still be loaded from the plugin dir (filesystem.c uses PLUGIN_INSTALL_DIR), so be sure to set it or the cmake build fails. Change-Id: I87d2d705434052220f9619438c90905c24b2a3a6 Reviewed-on: https://code.wireshark.org/review/18976 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: Michael Mann <mmann78@netscape.net>
2016-12-04Reflect API changes.Guy Harris1-1/+1
Change-Id: I6a8d50cb697bcd4a5232dc01107c7d9618258d87 Reviewed-on: https://code.wireshark.org/review/19071 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Rawshark uses libwiretap, so it has to call wtap_init().Guy Harris1-0/+2
Change-Id: I4b87227e4828ebad98b22e5e5d1f3896e636582a Reviewed-on: https://code.wireshark.org/review/19070 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Have a routine to do all the work of initializing libwiretap.Guy Harris15-49/+37
Have programs that use libwiretap call that routine rather than separately calling some or all of init_open_routines(), wtap_register_plugin_types(), and wtap_opttypes_initialize(). Also don't have routines internal to libwiretap call those. Yes, this means doing some initialization work when it isn't necessary, but scattering on-demand calls throughout the code is a great way to forget to make those calls. Change-Id: I5828e1c5591c9d94fbb3eb0a0e54591e8fc61710 Reviewed-on: https://code.wireshark.org/review/19069 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Show codec information in About dialogPeter Wu5-0/+30
Show codec libraries in About dialog, this should give the user a clue of what codecs are available. SBC is already supported, Spandsp (for G.722/G.726) is work in progress. Change-Id: Iebc4d9c9fae619a442e06c8afc780a420aa3971b Reviewed-on: https://code.wireshark.org/review/18978 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: Peter Wu <peter@lekensteyn.nl>
2016-12-04codecs: allow it to be used without pluginsPeter Wu4-6/+11
Not all codecs require the plugin infrastructure. For example, G.711U/A is a built-in codec. Allow such functionality to be registered even if plugin support is disabled. Change-Id: I2505cc9955e7953268ec0739531278921f70a771 Reviewed-on: https://code.wireshark.org/review/18977 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-04[Automatic update for 2016-12-04]Gerald Combs12-3821/+3907
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icad3ffb6cbd570b0b8a2c650d3c11a3c9bed536f Reviewed-on: https://code.wireshark.org/review/19066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-04Qt: clear Export Objects list on retappingPeter Wu1-0/+3
The tap reset callback should not just invoke the reset callback of the dissector, but also clear the previous list of objects in the dialog. Otherwise duplicate entries will be created every time retapping occurs (e.g. on changing the display filter). Bug: 12230 Change-Id: I75f25db0652dcc9c0ac59ab0e536c06874aedb9c Reviewed-on: https://code.wireshark.org/review/19055 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: Peter Wu <peter@lekensteyn.nl>
2016-12-04ssh: fix the heuristic for MAC size determinationРоман Донченко1-2/+1
size_str points to a dash, so the result of calling ws_strtoi32 on it is a negative number, which becomes a huge positive number, because size is a guint32. Parse the number after the dash instead, and use ws_strtou32. Also, check that size is divisible by 8, since otherwise it's unlikely to be a bit length. Change-Id: I531f67d45e9e914574d36a9ffceed9239fd46d64 Reviewed-on: https://code.wireshark.org/review/19006 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-04Have separate merge APIs for regular file/temporary file/standard output.Guy Harris9-161/+399
This is similar to what we have for opening a dump file - one API that uses the file name as specified, one that creates a temporary file and provides the file name, and one that uses the standard output. All of those APIs handle closing the output file. Change-Id: I56beea7be347402773460b9148ab31a8f8bc51e1 Reviewed-on: https://code.wireshark.org/review/19059 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Squelch a casting-away-constness warning.Guy Harris1-2/+2
Change-Id: I77ca8ffd38baf812ef20b9611f59cd70ae37d392 Reviewed-on: https://code.wireshark.org/review/19062 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Remove unnecessary cast (gchar = char) that removes const.Guy Harris1-1/+1
Change-Id: I3924c2b4a525c0ae5ab57b7f9867296586d78509 Reviewed-on: https://code.wireshark.org/review/19061 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Update list of symbols.Guy Harris1-55/+6
Remove symbols from plugins; they're not part of libwireshark. Put all the get_rtd_ symbols together. Add some new symbols. Change-Id: I724ca7fd19ad083b7e05526a30974c23fa321e0b Reviewed-on: https://code.wireshark.org/review/19060 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-03Use ws_close(), rather than the UN*X-only close().Guy Harris1-3/+3
Change-Id: Iae29db90273191c10455e172bdd2aac00b12143c Reviewed-on: https://code.wireshark.org/review/19058 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-03Get rid of test printout.Guy Harris1-1/+0
Change-Id: I0db268b0f7010d23c938ae56674cc5cd6c0bd998 Reviewed-on: https://code.wireshark.org/review/19057 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-03When opening the standard output for writing, dup it.Guy Harris4-56/+31
That way, we can close the resulting wtap_dumper the same way we close any other wtap_dumper, including closing the FD, rather than trying to do everything *except* closing the FD (which is tricky for a FILE *). Change-Id: I8cb66e32784d73e598b2e8720a12f9bdab1c6205 Reviewed-on: https://code.wireshark.org/review/19054 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-03ssh: dissect the host key when the connection uses DH group exchangeРоман Донченко1-7/+1
After this, hf_ssh_kexdh_host_key is no longer used, so remove it. Change-Id: Ie56a086481bbe087b7ba3b17aea394c05986f63d Reviewed-on: https://code.wireshark.org/review/19052 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>
2016-12-03install_rpms_for_devel: add optional packages.Dario Lombardo1-2/+20
Install all optional dependencies as reported by cmake. Tested on Centos7, openSUSE Leap 41.1, Fedora 24. Fedora 24 is shipped with lua5.3, that is not compatible with the current master, then it is not enabled. Change-Id: Ie4de7ff2849d66371e94d5d7960aab8146337dea Reviewed-on: https://code.wireshark.org/review/18968 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-12-03packet-infiniband: Fixed duplicate conversation entriesParav Pandit3-67/+123
1. Fixed find_conversation for PT_IBQP to not lookup in reverse direction when all searches fail. This is required, because there could be valid different connection in reverse direction which mistakenly gets updated for non template cases. 2. Added support for having MAD data for upper level dissectors to process during RC packet processing. This is required because connection options are negotiated out of band using this CM exchanges (unlike in band TCP options). 3. Moved creating unidirectional connections when actually MAD packets are processed. Previously client-to-server unidirectional conversation was created when CM_RSP stage, where MAD Data of CM_REQ packet is inaccessible. 4. Fixed creating multiple conversations with same address property by eliminating create_conv_and_add_proto_data during RTU stage, which was incorrect. Now they are created during REQ and RSP frame processing. (Instead of RSP and RTU processing). 5. Added support for creating bidirectional connection that ULP can refer. This is required to keep track of oustanding transactions on a connection (requests and responses). Bug: 11363 Change-Id: I32ea084a581a58efbc16dbb7a3e267c82622c50c Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/18982 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-03tshark: Add -G folders reportJim Young2-0/+105
Add a new tshark feature to generate a folders report. The folders report is essentially the information presented by Wireshark's About / Folders page in a TAB delimited format. Change-Id: Ic4b3d332b4bdaa7e6b7aad1e9cc5dd18413aada6 Reviewed-on: https://code.wireshark.org/review/19002 Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-03Temporarily break up complicated expression into a bunch of separate ifs.Guy Harris1-0/+63
Maybe this way we can identify which *particular* test is, according to Valgrind, looking at uninitialized data; there's nothing obvious that shows up from inspecting the code, and neither of our static analyzers seem to have found anything. Change-Id: I80f6bb8e6fa92decfe195c01766330b97e980821 Reviewed-on: https://code.wireshark.org/review/19049 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02packet-rpcrdma: Fix protocol frame pre-detectionChuck Lever1-37/+90
The current mechanism of detecting RPC-over-RDMA is broken because it treats the Read list as a counted array (it's a list); and treats the Write list and Reply chunk identically (one is a list, one is always a single chunk). While we're here, refactor pre-detection helper functions so they can be used during frame dissection as well. Bug: 13196 Change-Id: I76e210c8d2a9464fed00e7199072d37f4ebbebf2 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19025 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-02echo: decide on req/resp based on matched portJaap Keuter1-1/+1
Since the use of 'Decode as' can result in another port number than the default port (7) being the service port, this should be checked against. Change-Id: I93383613115595fff621e2fb9ab7959cd448c01e Reviewed-on: https://code.wireshark.org/review/18991 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: Peter Wu <peter@lekensteyn.nl>
2016-12-02packet-rpcrdma: Display length and version fields in decimalChuck Lever1-8/+8
Display length fields in decimal, just as they are displayed by the RDMA RETH dissector. Display version fields in decimal, just as they are displayed by the RPC dissector. RDMA offset fields are left in hexadecimal since they are essentially addresses, and at least the Linux RPC-over-RDMA implementation has debugging messages that display these as hexadecimal values. Change-Id: I7206970675ca0ca486b3a2837b6dbb1c4d764091 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19028 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-02Include config.h first, for large-file-related #defines.Guy Harris1-2/+2
Change-Id: Iced77fb65c2db8bc370cefe4c48c972fe1262f92 Reviewed-on: https://code.wireshark.org/review/19039 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02packet-rpcrdma: Dissector should exit when frame is not RPC-over-RDMAChuck Lever1-1/+1
On an RDMA transport, RPC protocol never appears in a frame by itself. If RPC-over-RDMA is not present, then RPC is by definition not present as an InfiniBand data payload. Bug: 13195 Change-Id: Icaea9d4936477af32adc73140c67539e977a7a9a Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19024 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-02Include config.h first, for large-file-related #defines.Guy Harris1-2/+1
Change-Id: Id71326bc89e1461b100df99b618a1c49256b93af Reviewed-on: https://code.wireshark.org/review/19037 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02Include config.h at the very beginning of all Flex scanners.Guy Harris12-19/+60
That way, if we #define anything for large file support, that's done before we include any system header files that either depend on that definition or that define it themselves if it's not already defined. Change-Id: I9b07344151103be337899dead44d6960715d6813 Reviewed-on: https://code.wireshark.org/review/19035 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>
2016-12-02Make SMB2 MessageId field a FT_UINT64Michael Mann2-3/+3
Also adjust the smb2_info_t structure that handles the value. Bug: 12915 Change-Id: Ia314b8dc840b9d26d2c1d185f06ef93f242a3a7b Reviewed-on: https://code.wireshark.org/review/19019 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-02Put tap-exportobject.h into the release tarball.Guy Harris1-0/+1
Change-Id: I5c103c5b513c32c5de0ea90956f9049fd6b0edec Reviewed-on: https://code.wireshark.org/review/19022 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02Enable exporting objects with tsharkMoshe Kaplan40-1267/+1846
A new "--export-object <protocol>,<destdir>" option is added to tshark. This required refactoring Export Object behavior in all GUIs to give the export object handling to the dissector, rather than the ui layer. Included in the refactoring was fixing some serious memory leaks in Qt Export Object dialog, crash due to memory scope issues in GTK Export Object dialog, and addition sorting column feature in Qt dialog (set up by creating a widget to manage the items that were previously leaking memory) Bug: 9319 Ping-Bug: 13174 Change-Id: I515d7662fa1f150f672b1476716f347ec27deb9b Reviewed-on: https://code.wireshark.org/review/18927 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-02BOOTP: Fix V-I Vendor-Specific Information OptionJaap Keuter1-13/+37
Apply the same value checks to the vendor generic suboption dissection as is done for the Cable lab and ADSL forum ones. See https://ask.wireshark.org/questions/57695 for an example issue. Change-Id: I4fe07d07cf0a93f4693e5ff54dd70c008701cf41 Reviewed-on: https://code.wireshark.org/review/18999 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: Michael Mann <mmann78@netscape.net>
2016-12-02autotools: fix typo.Dario Lombardo1-1/+1
The required executable is rpmbuild and not rpm. Change-Id: Iba1bff9c7fb6907659451a977ad8ab98efb169da Reviewed-on: https://code.wireshark.org/review/19015 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-02simple_dialog(.h): fix parameter 'Type' not found in the function ↵Alexis La Goutte1-1/+1
declaration [-Wdocumentation] Change-Id: I3dc476af941221b1d59f31bd6f639a49059e38a9 Reviewed-on: https://code.wireshark.org/review/19014 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-02Make sure config.h is included before inet_addr.h.Guy Harris1-2/+2
Otherwise, _FILE_OFFSET_BITS might be defined by a header file included by inet_addr.h before it gets defined by config.h. Change-Id: I5987b3f1493b81fd2d427d9792b9606117b255d0 Reviewed-on: https://code.wireshark.org/review/19018 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02Do *NOT* strip newlines from the standard input of sed.Guy Harris1-1/+1
There is *NO* guarantee that sed will do anything useful with input that doesn't have a newline and, in fact, the default sed in Solaris 11 doesn't produce *any* output if you hand it input with no newline. Furthermore, doing xxx=`yyy` will, if the output of yyy has newlines at the end, strip them; to quote section 2.6.3 "Command Substitution" of the Single UNIX Specification: The shell shall expand the command substitution by executing command in a subshell environment (see Shell Execution Environment) and replacing the command substitution (the text of command plus the enclosing "$()" or backquotes) with the standard output of the command, removing sequences of one or more <newline> characters at the end of the substitution. so there's no need to strip the newline. Change-Id: Ia710f67a42739c1e218eb9fec53a54bde6e010da Reviewed-on: https://code.wireshark.org/review/19016 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>
2016-12-02Qt: Fix QStyledItemDelegate assertions.Gerald Combs4-3/+10
QStyledItemDelegate::paint asserts if you pass it an empty QModelIndex. We were doing this in PercentBarDelegate and TimelineDelegate in order to keep it from drawing any text. Return an empty string from ::displayText instead, which appears to be the correct way to paint without text. Bug: 13180 Change-Id: I8064d9575e04e95a926797eec7f6ad2b0bfef1c0 Reviewed-on: https://code.wireshark.org/review/19007 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-02The Kerberos dissector include Kerberos header, and needs KRB5_CFLAGS.Guy Harris1-1/+2
Change-Id: I9a0e6ff09292fafca970e8ff423f18a835b5f2c4 Reviewed-on: https://code.wireshark.org/review/19011 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02Prefs: Use g_utf8_strlen instead of strlen.Gerald Combs1-1/+1
Change-Id: I99e2906b3c31f4aebcda44f4433f0fdd457ced3b Reviewed-on: https://code.wireshark.org/review/19008 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-02Clean up error messages.Guy Harris1-7/+12
Also, use elif in some chains of tests, to make it a bit clearer that the cases in question are disjoint. Change-Id: I6dc92d536450c7ac3db6ee118581a5ed0c3ce80c Reviewed-on: https://code.wireshark.org/review/19009 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-01RPM: fix the date in a recent changelog entry.Jeff Morriss1-1/+1
RPM complains when the date isn't valid. Change-Id: I859a9900ba87d52159071b06310d5873c092231a Reviewed-on: https://code.wireshark.org/review/19003 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-12-01ssh: add DSA host key dissectionРоман Донченко1-0/+29
Change-Id: Ib1e2b4e57832e94b94d34102c0079f820b18f350 Reviewed-on: https://code.wireshark.org/review/19000 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>
2016-12-01Check preference titles and descriptions.Gerald Combs14-32/+63
When registering preferences, make sure our titles and descriptions are valid UTF-8. Make sure our titles are short and only contain printable characters. Fix problematic titles and descriptions. Change-Id: I20d3f93438f2b3c30266f934297feb79897f2ee5 Reviewed-on: https://code.wireshark.org/review/18998 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-30Qt: fix crash when closing RTP player while playingPeter Wu1-0/+3
For some time, the RTP Player has been crashing for me (Arch Linux, Qt 5.7.0) when the RTP Player is active (affects also Wireshark 2.0.5). This call trace was observed: + RtpPlayerDialog::reject (closing dialog via Escape / Close button) + RtpAudioStream::stopPlaying + RtpAudioStream::outputStateChanged(QAudio::StoppedState) + QAudioOutput::deleteLater // problematic! + RtpPlayerDialog::~RtpPlayerDialog + RtpAudioStream::~RtpAudioStream As the QAudioOutput instance is a child of RtpAudioStream, it is also destroyed after that. QAudioOutput's destructor somehow invokes (via libqtmedia_pulse.so) a main loop iteration which invokes the previously scheduled deleteLater call. As QAudioOutput was already being destructed, this results in a crash. Workaround this by removing this child from RtpAudioStream (no cruelty intended). Change-Id: I88f2e929ac566534be5d2270e2e0b194685533eb Reviewed-on: https://code.wireshark.org/review/18970 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-30Qt: Fix simple_dialog formatting.Gerald Combs3-18/+36
Make sure that simple_dialog displays plain text. Trim whitespace and remove excessive newlines in order to improve message formatting. Add a comment about simple_dialog's behavior in Qt and GTK+ and how it might be improved. Bug: 13178 Change-Id: Ic6ff3cecd5ef1d76ec095d7a409f38e602b41ce2 Reviewed-on: https://code.wireshark.org/review/18985 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-30ssl,dtls: add expert info for overly large record lengthsPeter Wu3-3/+19
All TLS and DTLS RFCs (and SSLv3) limit the record length to 2^14, so add expert info if this is exceeded. Spotted in the wild via https://ask.wireshark.org/questions/57641/tls12-record-length-gt-16k-valid Tested with a synthetic pcap having length 2^14+1 using Python: from scapy.all import IP, TCP, UDP, wrpcap len_plus_frag = b'\x40\x01' + 0x4001 * b'\0' wrpcap('bad-record-length.pcap', [ IP()/TCP(sport=2000, dport=443)/(b'\x17\x03\x03' + len_plus_frag), IP()/UDP(sport=2000, dport=853)/(b'\x17\xfe\xfd' + 8*b'\0' + len_plus_frag) ]) Change-Id: I5eac48775333d8d222e013a24a6d06da79892b77 Reviewed-on: https://code.wireshark.org/review/18959 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-30sip: register with Websocket dissector (RFC 7118)Peter Wu1-0/+1
The subprotocol is also listed in the IANA registry at https://www.iana.org/assignments/websocket/websocket.xhtml#subprotocol-name Tested with the pcap from the linked bug. Bug: 11420 Change-Id: I4ba8e6c55889f72f5aca37c4ae759e2cd20a22b7 Reviewed-on: https://code.wireshark.org/review/18989 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>
2016-11-30Fix the build when a different version of Qt is in PATHРоман Донченко3-3/+3
When we add our Qt to PATH, prepend it so that it will be found first. Change-Id: I405496d6a08d676b5a2e0d9bd792de7ba9abe7f9 Reviewed-on: https://code.wireshark.org/review/18988 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-11-29Qt: fix GoToPacket when Voip Calls dialog is closedPeter Wu3-9/+5
After opening the Call Flows dialog from the Voip Calls dialog, followed by closing the Voip Calls dialog, the Go To Packet functionality in the Call Flows dialog is broken. That happens because the signal is not proxied anymore. Just remove all these indirections via signals and directly update the selected packet. Change-Id: I9c6d519dbe800e4dfdf0407d832f17819b344e46 Reviewed-on: https://code.wireshark.org/review/18933 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 10:44:24 +0000