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>
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>
+ 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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
a composite tvb is the top-level data source tvb
fix composite_get_ptr function
Change-Id: Ibab58801a754fd88fb86b9a13804bccf2ad51c7a
Reviewed-on: https://code.wireshark.org/review/15643
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>
Copy in some text from bug 12419.
Change-Id: Ice3c6cab1f5c32033de3a9a78d7945c31d932755
Reviewed-on: https://code.wireshark.org/review/15649
Reviewed-by: Gerald Combs <gerald@wireshark.org>
... Even if it doesn't look like HTTP. When TCP desegmentation is turned off
the dissector will be called with frames that don't look like HTTP--but it's
(almost certainly) still HTTP.
This adjusts the changes I9f1c736baaeb86f9fab61601d79e79b4e3a16c38 and
I2617d1e49030bd5ad85b0e818c48c01dc6fae075--hopefully without breaking the
intent of either.
Bug: 10335
Change-Id: I925d53d4f82a01aeffa5d129e53100cc4f488561
Reviewed-on: https://code.wireshark.org/review/15136
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>
The UI crashes when saving a RTP due to a division by zero.
To reproduce: open a RTP capture file, Telephony->RTP->RTP Streams,
then choose a stream, ANALYZE, SAVE, AUDIO, choose a path.
Bug: 12211
Change-Id: I51d61eb6797fc82c1b03254abaec839d3a1e281d
Reviewed-on: https://code.wireshark.org/review/15621
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Added partial support for Secure DDS as well as TopicQuery and
IP Mobility (RTI features).
Fixed also a few bugs: wrong octet sequence offset, fixing "switch"
statement that was falling through and shouldn't, fixing endpoint
filters and correct dissection of inline_qos.
Change-Id: I9d1c048eaaf3914420bdd6be37fb2040a6a47874
Reviewed-on: https://code.wireshark.org/review/15496
Reviewed-by: Anders Broman <a.broman58@gmail.com>
It requires some "extra work" to get it to work properly. Despite
documenting it, some previous use cases didn't do the extra work.
Let's just see how we get by without it.
Change-Id: I31dba1d5038d793085f6c9e4b4a6eda574e86872
Reviewed-on: https://code.wireshark.org/review/15610
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>
The column type is automatically changed to Custom if user clicks
on the "Fields" or "Field Occurrences" column. This can be
accidental and cause the user grief if he doesn't realize it.
If there is no text in the field, restore the type to its
original value.
Bug: 12465
Change-Id: I0453f43be13077aba58cca61011eeff9ca9b83b2
Reviewed-on: https://code.wireshark.org/review/15600
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>
we can simply abort the dissection for invalid lines or token lengths
Change-Id: I14e02f49a8803db7ec0a5f5c5139705091fd926a
Reviewed-on: https://code.wireshark.org/review/15628
Reviewed-by: Anders Broman <a.broman58@gmail.com>
remove some if (tree) checks
rewrite the initial check for a valid packet
use the correct data type for ti
Change-Id: I56f103be074606e7741db395976e28b4fe27d137
Reviewed-on: https://code.wireshark.org/review/15629
Reviewed-by: Anders Broman <a.broman58@gmail.com>
we alreday bring up an exception and exit cleanly,
so we can just remove the THROW()
Change-Id: I9af9b5349599cc1e19fdfa427cbffcb00a04a7be
Reviewed-on: https://code.wireshark.org/review/15633
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
exit if the ACL length is smaller than expected
Change-Id: I86e218a31ee1d5d1cb95eb3438ca5dc1a87205d4
Reviewed-on: https://code.wireshark.org/review/15626
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
we can simply exit, returning the number of bytes we processed
delete an unnecessary cast while it at
Change-Id: I77596a315fcb4c64a0ad017d2b77b702b1829144
Reviewed-on: https://code.wireshark.org/review/15625
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
'opa.reserved' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'opa.mad' exists multiple times with NOT compatible types: FT_NONE and FT_PROTOCOL
'opa.mad.attributemodifier.a' exists multiple times with NOT compatible types: FT_UINT32 and FT_BOOLEAN
'opa.mad.attributemodifier.a' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT32
'opa.mad.attributemodifier.b' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT32
'opa.mad.attributemodifier.b' exists multiple times with NOT compatible types: FT_UINT32 and FT_BOOLEAN
'opa.trap.datavalid' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT16
'opa.trap.datavalid' exists multiple times with NOT compatible types: FT_UINT16 and FT_BOOLEAN
'opa.switchcongestionsetting.controlmap' exists multiple times with NOT compatible types: FT_UINT32 and FT_NONE
'opa.aggregate.error' exists multiple times with NOT compatible types: FT_NONE and FT_BOOLEAN
Change-Id: I7971009d19f4916db1c6b0b572595a07bd2072e4
Reviewed-on: https://code.wireshark.org/review/15620
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
Change-Id: I6b76b55325db494f16488decfe94ff4129d0ac40
Reviewed-on: https://code.wireshark.org/review/15616
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>
Jens Kilian