aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-06-03Add the Display Filter Expression dialog.Gerald Combs23-91/+946
Changes from the GTK+ UI: - The display filter is built on the fly with immediate syntax feedback. - Slightly different layout. - You can search for fields. Make the plain SyntaxLineEdit a bit more plain. Bug: 11128 Change-Id: I06a48cd7b9ba7b9dc193b0199540aede4eb62fa7 Reviewed-on: https://code.wireshark.org/review/8742 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-06-02[RTPproxy] Set column name to RTPProxy-ngPeter Lemenkov1-0/+1
Set column name to RTPProxy-ng if a new protocol is used. Change-Id: I8c79ad5426808ad6944060e9c12fa4ac1f02e432 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> Reviewed-on: https://code.wireshark.org/review/8737 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-02Revert "MSVC 2015RC does not like the #defines using OFFSETOF replace them ↵Anders Broman1-564/+282
by absoulute numbers." This reverts commit 0808f4c9584b309548996388aafde51820a68932. Change-Id: I899cbeec86f34a00ded41040257e5de3ab537175 Reviewed-on: https://code.wireshark.org/review/8736 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-02MSVC 2015RC does not like the #defines using OFFSETOF replace them byAnders1-282/+564
absoulute numbers. Change-Id: I1de97be98c06bee2d7ddca38496a72e93567cbcf Reviewed-on: https://code.wireshark.org/review/8734 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-02ISAKMP: do not try to defragment IKEv1 packetsPascal Quantin1-2/+4
Bug: 11242 Change-Id: I289a5eeb056822299f6cb436047418aec785dca5 Reviewed-on: https://code.wireshark.org/review/8728 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: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-01gtk: Don't handle deprecation warnings as errorsBalint Reczey2-2/+2
This fixes compilation with latest gdk-pixbuf. I plan rewriting the code to drop deprecaated function usage in a different commit and reverting this one. Ping-Bug: 10750 Change-Id: I400e34e625b147a4858e73240602d75910c6eece Reviewed-on: https://code.wireshark.org/review/8720 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-01AFS: Fix Mac OS X buildbot (-Wshadow)Alexis La Goutte1-3/+3
Rename index -> idx Change-Id: I22b23535e3d24866bdbe63be8f242a3c3ebcc6ba Reviewed-on: https://code.wireshark.org/review/8726 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-01Convert AFS dissector to use ptvcursor API.Michael Mann1-1236/+1058
The dissector was written in all macros, presumably to get just a single lines to display a field. The ptvcursor API is good for that, and using it over macros more than halves the object size. Real code (vs macros) is also much easier to use in a debugger. It also makes it easier for the check* scripts to find possible errors. Also eliminate proto_tree_add_text. Change-Id: Id07e015b5a2d1a98a4b36e40a426442d826d9a09 Reviewed-on: https://code.wireshark.org/review/8723 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-06-01Eliminate proto_tree_add_text from packet-sip.cMichael Mann1-21/+31
Change-Id: I560b2b0660ce2274507721450534d4d50fb6aec5 Reviewed-on: https://code.wireshark.org/review/8713 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-01Websocket: Fix Dead Store (Dead assignement/Dead increment) warning found by ↵Alexis La Goutte1-1/+1
Clang Change-Id: Ica45c5d316d04df977449a12f824c76642d6c4bd Reviewed-on: https://code.wireshark.org/review/8722 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: Anders Broman <a.broman58@gmail.com>
2015-05-31Don't create a GLib main loop.Guy Harris1-1/+0
In the Qt Wireshark, the main loop is a Qt main loop; no need for a GLib one. Change-Id: I65378eb9a73d145ef60389e5e02a128e2321c403 Reviewed-on: https://code.wireshark.org/review/8721 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-31Eliminate proto_tree_add_text from packet-http.cMichael Mann1-19/+45
Change-Id: Ib94eabeea865ef5c5d9ce4cef26d9faa51c5659d Reviewed-on: https://code.wireshark.org/review/8715 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-05-31Eliminate proto_tree_add_text from packet-dcerpc-ndr.c and ↵Michael Mann4-4/+20
packet-dcerpc-netlogon.c Change-Id: I65eff9c8087424087a307f18b96a202f0364e371 Reviewed-on: https://code.wireshark.org/review/8714 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-31Fix zlib cmakeGraham Bloice4-13/+12
Add support for the locally modified version of zlib to suppress a CMake warning and disable building of the zlib examples. Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23 Reviewed-on: https://code.wireshark.org/review/8706 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>
2015-05-31VGCS/VBS Assignment Request: Add param dissectorMikhail Koreshkov1-7/+15
Function for dissect Assignment Requirement parameter Change-Id: I0ed8748913e5fe3dd509a78a5285520f6f63abac Reviewed-on: https://code.wireshark.org/review/8700 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-31websocket: restructure tree, always unmask payloadPeter Wu1-205/+124
Changes: - Instead of special-casing masked and unmasked payload data, always unmask the payload before using it. This fixes handling of SIP requests which are masked and would previously not be dissected by the SIP handle. (As a result, many fields are removed). - Dissected text protocols (for example SIP) are now shown below the Websocket layer instead of inside the payload tree. - Use line-based text dissector as fallback for text decoding, and use data dissector for binary decoding. - Treat the optional close reason as UTF-8 instead of ASCII. - Group the close fields (status code, reason) in a subtree below close to avoid confusion. Make Close FT_NONE to avoid displaying hex. - Split dissection of the payload in separate functions for control and data frames. Change-Id: I78b0078d51271bef94229d4b7c6c528b5e3a424d Reviewed-on: https://code.wireshark.org/review/7294 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2015-05-31[Automatic update for 2015-05-31]Gerald Combs27-592/+376
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I596469e49e1831939305178b0ab14b18f9b00d4b Reviewed-on: https://code.wireshark.org/review/8711 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-31[Automatic update for 2015-05-31]Gerald Combs17-3703/+4456
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I5ff709ae337949905bc4151bbbfcbb125eb9f5d3 Reviewed-on: https://code.wireshark.org/review/8707 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-31configure.ac: openSUSE build fixBart Van Assche1-85/+58
For some Linux distro's (e.g. openSUSE) the Qt4 tools have no suffix and the Qt5 tools have the suffix "-qt5". On such systems search for the Qt5 tools first. This avoids that compilation fails with the following error message: In file included from follow_stream_dialog.cpp:23:0: ui_follow_stream_dialog.h: In member function 'void Ui_FollowStreamDialog::retranslateUi(QDialog*)': ui_follow_stream_dialog.h:152:110: error: 'UnicodeUTF8' is not a member of 'QApplication' e(QApplication::translate("FollowStreamDialog", "Follow Stream", 0, QApplicatio ^ Bug: 11233 Change-Id: I09ccdb6a74043b6d952814b74fec5d618e6e26aa Reviewed-on: https://code.wireshark.org/review/8686 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-05-30ams: fixed wrong offset calculation, adsstate has 2 bytesThomas Wiens1-1/+1
Change-Id: I95813bb49dd9a51662bac521e82599c26de59e8e Reviewed-on: https://code.wireshark.org/review/8701 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-30BGP: remove proto_tree_add_text callAlexis La Goutte1-11/+24
Part7 Fix last proto_tree_add_text (use expert info) Change-Id: I9c4c053e5fc94f57608c7ee8355e6e16f8af6bd1 Reviewed-on: https://code.wireshark.org/review/8697 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>
2015-05-30BGP: remove proto_tree_add_text callAlexis La Goutte1-1/+8
Part6 Update SAFNUM_TUNNEL Change-Id: I4a3486f3fd12a624caa11e4ab424b26081b5b9ab Reviewed-on: https://code.wireshark.org/review/8696 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-30BGP: remove proto_tree_add_text callAlexis La Goutte1-100/+20
Part 5 Update SAFNUM_LAB_VPNUNIMULC/SAFNUM_LAB_VPNMULCAST/SAFNUM_LAB_VPNUNIMULC Simplify code but no tested on real pcap Change-Id: I02fc1bc8d4b406f34918130d1eb24d514c24385c Reviewed-on: https://code.wireshark.org/review/8695 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-30Q955.3 MLPP DissectorMikhail Koreshkov5-2/+414
Added ASN.1 dissector for MLPP (Multi-Level Precedence and Preemption) protocol Q955.3 Change-Id: Ic1c855dfbf1fb1295a43cfe3a5ad7087b5b89c12 Reviewed-on: https://code.wireshark.org/review/8689 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-05-30SCSI: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+0
Change-Id: Ie71203081f807401d3eee5601a1885e9a311f81e Reviewed-on: https://code.wireshark.org/review/8698 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30BGP: Remove proto_tree_add_text callAlexis La Goutte1-9/+28
Part 4 Update BGP Type TUNNEL_ENCAPS_ATTR Change-Id: Ib166cf42e4eee3513f4c2f64e18eb5de2ed4acf2 Reviewed-on: https://code.wireshark.org/review/8694 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30BGP: Remove proto_tree_add_text callAlexis La Goutte1-40/+64
Part 3 Update BGP Type MP REACH NLRI, MP UNREACH NLRI and SAFI_SPECIFIC_ATTR Change-Id: I28bc1385cf75b99739946e91d52c4d654ba525d3 Reviewed-on: https://code.wireshark.org/review/8693 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30NULL terminate the list of hfs given to proto_tree_add_bitmask*().Jeff Morriss2-4/+6
This fixes a number of recent fuzz failures. Bug: 11195 Change-Id: Ifa6cc380fd3f610469d3c795e234e6986cfaf674 Reviewed-on: https://code.wireshark.org/review/8699 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30Qt: Always draw a byte view.Gerald Combs2-1/+7
When we clear the ByteViewTab add an placeholder ByteViewText. Change-Id: I9fbcd7e609c084d5724a30f80aa141b59ab1c0a1 Reviewed-on: https://code.wireshark.org/review/8688 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-29Update some items.Gerald Combs1-49/+23
Update some (but not all) content to match current reality. Change-Id: Id7618067ed49a309fdace4f1eaa2c5d12cbfb6ad Reviewed-on: https://code.wireshark.org/review/8687 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-29Qt: Add Conversation Filter sub menuAlexis La Goutte9-26/+85
Apply conversation filters using the new color_dissector_filters.[ch] from g1f03180. Change-Id: I2e535bb3d5b95fd26226422daf9f83c452a95e3c Reviewed-on: https://code.wireshark.org/review/3558 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: 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-05-29ISAKMP: fix compilation without libgcryptPascal Quantin1-1/+6
Change-Id: Ie0d9cc3d81b57f81fe50791bf0c5762578a22b19 Reviewed-on: https://code.wireshark.org/review/8692 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-29ISAKMP: fix some compilation warningsPascal Quantin1-2/+2
Change-Id: If682a12e057f35991893db18dc5e6c4df5434973 Reviewed-on: https://code.wireshark.org/review/8690 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-29ISAKMP: implement RFC7383: Internet Key Exchange Protocol Version 2 (IKEv2) ↵Martin Mathieson1-53/+279
Message Fragmentation Change-Id: Ib6660e245729bf9d4399fa8aa1858877ec3244da Reviewed-on: https://code.wireshark.org/review/8685 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-29ANSI IS-637 A: fix byte highlighting of destination address when using ASCII ↵Pascal Quantin1-3/+3
encoding Change-Id: I11d5de26bd73bada742e808f582e0dd746032aa2 Reviewed-on: https://code.wireshark.org/review/8684 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-29idmp: Sync with asn1 sourceStig Bjørlykke1-3/+4
Change-Id: Ie46a86c696b6b8889032db0fc6678768f18e1fc1 Reviewed-on: https://code.wireshark.org/review/8682 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-05-29HTTP: Add support of PATCH method (RFC 5789)Andy Ling1-0/+1
Bug: 11229 Change-Id: I915d2efb873bfa72d500070f382dad10a991ecd4 Reviewed-on: https://code.wireshark.org/review/8673 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-29Update scsi lun id dissector, add support to handle all 4 addressingAnish Bhatt2-31/+142
methods Bug 11078 Change-Id: I7a9ff07d83b4bb5f5512c04d71aa7f1d3baa0edd Reviewed-on: https://code.wireshark.org/review/8181 Petri-Dish: Anders Broman <a.broman58@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>
2015-05-29Use FT_FLOAT for a floating-point number.Guy Harris1-6/+2
Change-Id: If74df214c41baac425fd89e8476578962a5cfde7 Reviewed-on: https://code.wireshark.org/review/8681 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-29enabled decoding of longlong and ulonglong in GIOPArtur Nowosielski1-0/+19
Change-Id: I21323ab6c44583494c4353650caea0d23ef3f30c Reviewed-on: https://code.wireshark.org/review/8679 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-28Use an "Open" instead of a "Save" dialog for UAT prefs.Gerald Combs2-1/+8
When selecting a file for a PT_TXTMOD_FILENAME UAT preference, use QFileDialog::getOpenFileName instead of QFileDialog::getSaveFileName. This matches current GTK+ behavior and the two preferences that use PT_TXTMOD_FILENAME. Add a comment noting that the PT_TXTMOD_FILENAME is Open-only. Bug: 11027 Change-Id: I29eb056422949eda700d448621e508cf094fd7b7 Reviewed-on: https://code.wireshark.org/review/8678 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-281.99.6 → 1.99.7.Gerald Combs10-14/+14
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28Build 1.99.6.Gerald Combs4-55/+9850
Change-Id: I8db40aea6c208d0badfc7d178b642328264e6c10 Reviewed-on: https://code.wireshark.org/review/8676 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28Set a capture buffer size only when we have a valid handle.Gerald Combs1-5/+3
Fixes the current Windows unit test crash. Clean up a warning message. Change-Id: I696e70c7656352d9576c1ad29703298cc7109621 Reviewed-on: https://code.wireshark.org/review/8674 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28switch to AC_PATH_TOOLMike Frysinger1-3/+3
The TOOL variant will automatically search for host prefixed scripts (e.g. armv7a-unknown-linux-gnueabi-pcap-config) before falling back to the default (i.e. pcap-config). This makes cross-compiling a bit simpler. Change-Id: Ia450839693b5550f798634a7e8b82c2a661b088c Reviewed-on: https://code.wireshark.org/review/8481 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-05-28Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameterAlexis La Goutte1-0/+12
Change-Id: I8fbcac112d0b60e0129ce0fc17a5e0ffab02710f Reviewed-on: https://code.wireshark.org/review/8589 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-28Windows: don't attempt to set the capture buffer size on remote (rpcap) devices.Jeff Morriss1-17/+19
Also move the code for setting the buffer size on Windows near the code for setting it when we have pcap_create(): into open_capture_device(). Bug: 9067 Change-Id: Ica45f74b98094958d8bb0a38de23248aaa251d4b Reviewed-on: https://code.wireshark.org/review/8551 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-28Document the services file in the man pages.Jeff Morriss3-0/+42
Bug: 11227 Change-Id: Id9cc64820b238bd8c82a758a553e1352398ad885 Reviewed-on: https://code.wireshark.org/review/8664 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-28Document the subnets file in the man pages.Jeff Morriss3-0/+60
Text adapted from that in the WSUG documentation of the same. Ping-Bug: 1445 Ping-Bug: 11227 Change-Id: I4d07cba437e70324d19c5ae23e44b86c47b749a8 Reviewed-on: https://code.wireshark.org/review/8662 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-28Don't warn about overwriting filename preferences.Gerald Combs3-8/+20
When specifying a filename preference (e.g. the SSL pre-master secret log filename) don't warn about overwriting the file. Most of the time we're reading the file and when we're not (e.g. for the SSL debug log) overwriting it is kind of the point. Preference descriptions are plain text. We display them in tooltips as rich text. Convert them accordingly. Fixup some of the SSL preference descriptions. Bug: 11010 Change-Id: I4f1b1f3dd270c01648d9dd52ae20381c3c0d2e37 Reviewed-on: https://code.wireshark.org/review/8665 Petri-Dish: Gerald Combs <gerald@wireshark.org> 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-07-02 01:04:00 +0000