aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-06-03Qt: Add UTF-16 output to Follow Stream.Gerald Combs3-2/+14
Add an option to display the "follow" data as UTF-16. Bug: 237 Change-Id: Id95ffc014b8ef718f3b6e9f3415806ada309c3a2 Reviewed-on: https://code.wireshark.org/review/15702 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> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-03[IEEE1722] Add a range_string for the subtypes we know about.AndersBroman1-2/+20
Ping-bug: 12490 Change-Id: I27ce4a0b870d81bfdea188f00ff8101897ad969d Reviewed-on: https://code.wireshark.org/review/15710 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-03SMB2: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
Change-Id: If6a147c0bac5fdb0888667712593a41f20a88012 Reviewed-on: https://code.wireshark.org/review/15708 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>
2016-06-03GSM RLC/MAC: better wording for PS HO data sourcesVincent Helfre1-2/+2
Change-Id: Id790e6f9f884181e4fcdda794b2b121ce918cb15 Reviewed-on: https://code.wireshark.org/review/15709 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-02GSM RLC/MAC: add dissection of 2G->3G/4G PS handoverPascal Quantin4-25/+105
Change-Id: Ia24055d7d871b9fbf69a9225a2a273fced950a3c Reviewed-on: https://code.wireshark.org/review/15700 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>
2016-06-02Remove 'if (tree)' checks from code samples.Jaap Keuter1-46/+22
Showing 'if (tree)' constructions in code samples and then having to explain these are no longer nessasery, or even wrong in many cases, indicates that these shouldn't be in the code samples in the first place. Change-Id: I1a0ccc84ad24ff998548fa913bc00c0336bf1123 Reviewed-on: https://code.wireshark.org/review/15659 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-02AT: fix heuristic checkPascal Quantin1-7/+6
It should loop on captured data, not reported one While we are at it, let's call tvb_format_text_wsp() only once Change-Id: If6805a91d8e5dcf641e682b453522d88cbc2df6c Reviewed-on: https://code.wireshark.org/review/15699 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>
2016-06-02Use file extension when capturing from multiple interfaces.Michael Mann2-3/+7
Also update faq to include new temporary file format. Change-Id: Ie6c318bb359974b89ff3e268155315c22ba7c4e4 Reviewed-on: https://code.wireshark.org/review/15685 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-02profinet: set ioDataObject structure to 0Pascal Quantin1-1/+1
Bug: 12486 Change-Id: I9e8be44325e0bdd5174bd01e4e1ea4922f7090cc Reviewed-on: https://code.wireshark.org/review/15696 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-02QUIC: Tag RSEQ and RNON use little endianAlexis La Goutte1-2/+2
Change-Id: Iacd6ebf9d6b289ccfe2cae7d2ea90d29b04e5e4d Reviewed-on: https://code.wireshark.org/review/15697 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-02clean up some comments in tvb_find_line_end()Martin Kaiser1-8/+7
Change-Id: I9025b479b31e3cc6f8108a163bf00d81008fd737 Reviewed-on: https://code.wireshark.org/review/15632 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-02IPv6: Don't disable relevant RPL expert infos with "strict" preferenceJoão Valverde1-31/+28
We keep the preference only for the single check that could be somewhat costly. Change-Id: If43a6965a0cf50e0e1864cf1900e529c773b5710 Reviewed-on: https://code.wireshark.org/review/15695 Reviewed-by: João Valverde <j@v6e.pt>
2016-06-02IPv6: Add indexes to routing header address vectorJoão Valverde1-8/+25
Change-Id: I8a08c2b0a2845b36d341d585b5408ee4b5f3f510 Reviewed-on: https://code.wireshark.org/review/15687 Reviewed-by: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt>
2016-06-02IPv6: Try to dissect routing exthdr even if length is not aligned.João Valverde1-27/+25
Change-Id: Ic88a862559fcd1d4bd04747d3fb727bcd3a6138e Reviewed-on: https://code.wireshark.org/review/15693 Reviewed-by: João Valverde <j@v6e.pt>
2016-06-01Qt: Firewall Rules dialog.Gerald Combs16-256/+910
Add the Firewall ACL Rules dialog. Try showing all valid rules for a given product instead of making the user select from a combobox. We can add the combo back easily enough if that's desired. Add a rule hint field and use it in the Qt and GTK+ UIs. Bug: 12469 Change-Id: I39dd840e9838f96d7c5e2b4c34662811c21d0386 Reviewed-on: https://code.wireshark.org/review/15689 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-06-01Qt: Use checkboxes in the capture options dialog.Gerald Combs2-147/+137
Switch from enabled/disabled comboboxes to checkboxes. This requires less clicking on the user's part and less translating. Draw em dashes instead of "n/a" for non-applicable items, and use the disabled palette when drawing them. Change-Id: Ic97b6d44734b679bbeee00e9c2a322e7b8a67247 Reviewed-on: https://code.wireshark.org/review/15661 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-06-01IPv6: Add option for extension header length field in octetsJoão Valverde1-41/+104
Change-Id: Ifacf00247f457d710e16044b6805c2f41dacddc1 Reviewed-on: https://code.wireshark.org/review/15686 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>
2016-06-01Add data structures necessary to support multiple Name Resolution blocks.Michael Mann9-69/+81
This doesn't try to use any data from multiple Name Resolution blocks, it just converts single Name Resolution block usage into a GArray, so the potential is there to then use/support multiple Name Resolution blocks within a file format (like pcapng) Change-Id: Ib0b584af0bd263f183bd6d31ba18275ab0577d0c Reviewed-on: https://code.wireshark.org/review/15684 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-06-01Create unique GUIDs for recently added file associations.Michael Mann1-3/+3
Change-Id: Ia07cb14995c3f06d8a32330209bb17fde344350a Reviewed-on: https://code.wireshark.org/review/15688 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-06-01Create a FieldFilterEdit class and apply it to custom column preference field.Michael Mann6-5/+381
DisplayFilterEdit deals with entire filters and some edit boxes just need a single protocol field. This control will do the trick. Bug: 12321 Change-Id: I8e5837ea9a6955ada29b7e516ea022ab1dd46f0d Reviewed-on: https://code.wireshark.org/review/15595 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-01Qt: Check for valid color filter before useStig Bjørlykke1-2/+4
Not all packet have a color filter, so check for this before use. Bug: 12065 Change-Id: Ieed8d369342bde50fe8a1562be9379695da9fbaa Reviewed-on: https://code.wireshark.org/review/15677 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-01Fix a compile error occurring on RedHat Enterprise Linux Workstation release ↵Jens Kilian1-0/+4
7.0 (Maipo). This fixes a compile error with Qt version 4.8.5-8 as installed in RHEL 7.0: sequence_dialog.cpp: In member function 'void SequenceDialog::mouseMoved(QMouseEvent*)': sequence_dialog.cpp:306:35: error: 'escape' is not a member of 'Qt' QString raw_comment = Qt::escape(sai->comment); ^ Change-Id: Ibbf62123441645471d66aa329f0d63d0ee198017 Reviewed-on: https://code.wireshark.org/review/15682 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-06-01Add data structures necessary to support multiple Section Header blocks.Michael Mann19-140/+177
This doesn't try to use any data from multiple Section Header blocks, it just converts single Section Header block usage into a GArray, so the potential is there to then use/support multiple Section Header blocks within a file format (like pcapng) Change-Id: I6ad1f7b8daf4b1ad7ba0eb1ecf2e170421505486 Reviewed-on: https://code.wireshark.org/review/15636 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-06-01[docsis->type35ucd] Fix TLV 15 & 16 bugsAdrian Simionov1-5/+9
+ TLV 15 has value decoded as on off + TLV 16 shows text parameters instead of decimal value Change-Id: I6f0baa410f12e20825379a3ff0cd6174aa2bc576 Reviewed-on: https://code.wireshark.org/review/15678 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-01ZigBee ZDO: fix parse of ZDO Node Descriptor Response.dsrsupport2-1/+8
Fix a bitmask for Stack compiliance revision. Add Network manager field. Bug: 12488 Change-Id: I0a0908f288997686b76899ee80d51c590599a32e Reviewed-on: https://code.wireshark.org/review/15681 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-06-01[SIP] If SIP URI userpart starts with a + add an MSISDN filter.AndersBroman1-0/+4
Change-Id: I047374100baa0bf90e0e88460bcb7694a5ef78da Reviewed-on: https://code.wireshark.org/review/15639 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-01at: remove an unnecessary if (tree) checkMartin Kaiser1-9/+8
Change-Id: I2e7805edd3312b9e8dd4540c60eca195c0f36445 Reviewed-on: https://code.wireshark.org/review/15680 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-01CSN1: fix dissection of variable bitmapsVincent Helfre1-28/+9
Change-Id: I3dbb2a4f8f7ea125e4f96e302ea33ff03706eb1b Reviewed-on: https://code.wireshark.org/review/15674 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-01GSM RLC/MAC: add dissection of NAS containerVincent Helfre2-19/+70
While we are at it, let's display other containers in hexadecimal instead of decimal Change-Id: I6ac6dd2a64271cbc2958860550da9024445bfe19 Reviewed-on: https://code.wireshark.org/review/15675 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-01Terminate last <dict> in Info.plistStig Bjørlykke1-0/+1
This bug was introduced in g162edec9. Change-Id: Ia7c6ab0ae35b9b0116c6c9396dfa6e5173967726 Reviewed-on: https://code.wireshark.org/review/15676 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-06-01Make the modelines more like other ones.Guy Harris1-4/+4
Thou shalt not ever use modelines that put the tab-character tab spots anywhere other than every 8 characters; that's where Ken and Dennis put them, and that's where they belong. Use whatever indentation you want, including 4-space indentation, but do *not* try to arrange that a tab character moves to the next 4-character boundary, because, in a lot of UN*X software, it doesn't. (Yes, this means that Xcode's default is wrong. It *is* wrong, especially given that it's an IDE for a UNIX.) Change-Id: I308745cdeef35b7c91ea493da6487baadc357f58 Reviewed-on: https://code.wireshark.org/review/15673 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-01Fix compile error:Joerg Mayer1-1/+1
[ 0%] Building C object wsutil/CMakeFiles/wsutil.dir/tempfile.c.o /Users/jmayer/worktmp/wireshark/git/wsutil/tempfile.c:228:37: error: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Werror,-Wshorten-64-to-32] fd = mkstemps(tf[idx].path, sfx ? strlen(sfx) : 0); ~~~~~~~~ ^~~~~~~~~~~ 1 error generated. No idea whether this is the correct fix. Change-Id: I80202d7eaad11fc3dcb5f9847f6e162caccb7e6e Reviewed-on: https://code.wireshark.org/review/15672 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-01Apache Cassandra CQL protocol v3.0Benoît Canet6-0/+1410
Change-Id: I74cddcce3104da269e9587ee78ff29785734188f Reviewed-on: https://code.wireshark.org/review/12479 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-01Allow create_tempfile to support a suffix.Michael Mann16-41/+47
Ping-Bug: 10203 Change-Id: Ifa24870d711449b87e9839dd46af614e4aa28fde Reviewed-on: https://code.wireshark.org/review/15608 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2016-06-01tshark man page: the first TCP stream is stream 0, not 1.Jeff Morriss1-6/+6
This fixes the example of the -z follow option. Also fix up some formatting in the same section. Bug: 12383 Change-Id: Ic9b2ef5e63ab31d70f2750f9cfdcbab76cf204b6 Reviewed-on: https://code.wireshark.org/review/15667 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>
2016-06-01Register a few more file extensions as belonging to Wireshark.Jeff Morriss7-8/+143
Register Wireshark for PacketLogger, ERF, IPFIX, and VWR files on freedesktop.org, OS X, and Windows (we were already registered for ERF and VWR files on Windows). Change-Id: I8105997cb15ea06e1c078489fd88763d4ce9e40c Reviewed-on: https://code.wireshark.org/review/15635 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-01Qt: Color _ANY and _TCP sequence analysis items.Gerald Combs4-3/+19
For SEQ_ANALYSIS_ANY, color each sequence diagram item according to its associated packet. For SEQ_ANALYSIS_TCP, color each item according to its stream. Bug: 12065 Change-Id: Ib43490fe55039fbcfa793223b5850233a2694a26 Reviewed-on: https://code.wireshark.org/review/15651 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: Anders Broman <a.broman58@gmail.com>
2016-06-01Update function block depiction.Jaap Keuter3-7/+3
Update the graphic showing the functional blocks, incorporating the changes which were listed as incorrect in the corresponding text. Change-Id: Id962b4e31cb2912a4de75fc0a7e7ab97ff60d117 Reviewed-on: https://code.wireshark.org/review/15662 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-01SMB2 ioctl FSCTL_OFFLOAD_WRITEGordon Ross1-44/+127
Decode SMB2 ioctl FSCTL_OFFLOAD_WRITE, and clean up FSCTL_OFFLOAD_READ to use a common function to print the "token". Bug: 12482 Change-Id: I397522416e3a8508f5a99b8ac055d1ae17218d21 Reviewed-on: https://code.wireshark.org/review/15663 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-01Change the declaration of nghttp2_mem_free2() to match the definition.Guy Harris1-1/+1
The free routine pointer was renamed to free_func to avoid collisions with the standard C free() function. From Jeff Morris' abandoned change Ia3810fe228b497d888d825f8b606078e2f71be65. Change-Id: Iedeb74625b13d1097da510487b60f38861a42bec Reviewed-on: https://code.wireshark.org/review/15666 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-01Pick up some updates from Jeff Morris' abandoned change.Guy Harris1-2/+5
See change Ia3810fe228b497d888d825f8b606078e2f71be65. Change-Id: Ia6df3434e31a4364bb867a978ee0f89738c19e9d Reviewed-on: https://code.wireshark.org/review/15665 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-31Squelch a compiler warning.Guy Harris1-2/+2
Change-Id: I7a0b48dd840a6b4795f87f983bbaf169afceece7 Reviewed-on: https://code.wireshark.org/review/15664 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-31Suggest that file types should also be registered in the WiX installer.Jeff Morriss1-2/+2
Change-Id: If65ff14589ccd0b2d643256f3443dc26b3b71371 Reviewed-on: https://code.wireshark.org/review/15640 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-05-31Qt: Use a standard "Start" button in Capture Options.Gerald Combs3-11/+8
QDialogButtonBox does a fine job of creating and managing buttons. Instead of creating our own "Start" button, just rename the "OK" button. This matches what we do elsewhere, e.g. in the Extcap Options dialog. Change-Id: I3c5eec1f01925f7b82c4e7360d685acbe4bb2fea Reviewed-on: https://code.wireshark.org/review/15653 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-31[docsis->rngrsp] Packet decoded in greater detailAdrian Simionov1-101/+107
Next steps would be to add expert and add missing TLVs. Change-Id: Ia05d81c380d412ab02e55bbfc08363d9153ff1c3 Reviewed-on: https://code.wireshark.org/review/15617 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-05-31SMB2 ioctl FSCTL_SRV_COPYCHUNK and relatedGordon Ross1-0/+110
Bug: 12481 Change-Id: I0439b10f99d296a46c93e2ced6094689737d9551 Reviewed-on: https://code.wireshark.org/review/15648 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-05-31ssl: export ssl_starttls_* functions so they can be used by plugins.jpmendoza2-2/+4
Change-Id: Ief8ca64391033e84fb37c6a55ec29d32d800920d Reviewed-on: https://code.wireshark.org/review/15645 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>
2016-05-31LTE-RRC: fix dissection of GPRS containerPascal Quantin2-2/+30
Payload embedded in LTE message does not include the first byte identifying the message type. Let's prepend a fake one before calling the gsm_rlcmac dissector Change-Id: Ibcf9b52902474a556b55e9b0a076d09d341f868c Reviewed-on: https://code.wireshark.org/review/15642 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-05-31Qt: Monitor mode fixups.Gerald Combs4-86/+171
When we update the monitor mode setting for an interface, update its link type list. Start filling in interface columns from a common function instead of multiple places. Rename some member function names to match https://www.wireshark.org/docs/wsdg_html_chunked/ChUIQt.html#_coding_practices_and_naming_conventions Bug: 11364 Change-Id: I26ac7e9719863169b62069e49ebf17ed97fbe516 Reviewed-on: https://code.wireshark.org/review/15583 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-31RTPS: Updated name of CRC fieldJuanjo Martin1-1/+1
The name specified "no header". This is false. It contains the header. Change-Id: I921b7c23d64f43551830e840066231031432dc7c Reviewed-on: https://code.wireshark.org/review/15646 Reviewed-by: Michael Mann <mmann78@netscape.net>