For attributes, handle them the same way we handle duplicate vendors.
For TLVs, ignore duplicates; they shouldn't happen.
Change-Id: Ie968478c40a9b7848fa8ea25b144eda8656e5874
Reviewed-on: https://code.wireshark.org/review/5268
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Change-Id: Ide14bcac0b1563bee4260ac9c1a280ba99e97e71
Reviewed-on: https://code.wireshark.org/review/5261
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>
If, when adding a new vendor, we already find a vendor with the given
ID, don't bother adding it to the vendors-by-ID table with the same ID,
and, if and only if the vendor name has changed, remove it from the
vendors-by-name table, free the old name, replace it with the new name,
and, add it back to the vendors-by-name table with the new name.
Bug: 10666
Change-Id: I43ebcb57c742563157c71b01ebc0b35797a408e1
Reviewed-on: https://code.wireshark.org/review/5265
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Some compilers complain that we're casting a 16-bit integer to a
pointer; making it a standard-size integer squelches the warning.
Change-Id: Iba0e767d7801afdc369b64a1cf050bf8db37da7b
Reviewed-on: https://code.wireshark.org/review/5264
Reviewed-by: Guy Harris <guy@alum.mit.edu>
As discussed in change 5185, the "big 3" HIGs discourage the use of
traditional group boxes. Flatten our existing ones.
Change-Id: I68ef4aa9fd0f69a42750bf735df2250a468bfb2d
Reviewed-on: https://code.wireshark.org/review/5263
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add CFM and MPLS dissector as possible decoders.
Bug: 10574
Change-Id: Ic39c6b8d68b965ff9d342f5ee789a8eff3134a5a
Reviewed-on: https://code.wireshark.org/review/4935
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
warning coming after g055e4768ece and g421913b721
Change-Id: I5caeeb89c559faef8007f2946c68c7172b75dfa8
Reviewed-on: https://code.wireshark.org/review/5250
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>
- The heuristic chek was missing "e" out of "Art-Net\0"
- tvb_length() - tvb_captured_length()
Change-Id: Iad9900f3a22e2fdbd0d6056efc1af90511cc458a
Reviewed-on: https://code.wireshark.org/review/5257
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Warning found by Clang
Change-Id: I7b801808aefa294e32fff560ea1a49620f0e0ea0
Reviewed-on: https://code.wireshark.org/review/5249
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Change-Id: I1540c7878692625a9e38b48f8681c07bab852a64
Reviewed-on: https://code.wireshark.org/review/5234
Reviewed-by: Michael Mann <mmann78@netscape.net>
different from the timestamp's offset to UTC.
The fix for bug 6712 ignored the fact that daylight savings will affect the
offset from UTC--and whether daylight savings is in effect today might be
different than whether it was in effect in the timestamp we're decoding.
Bug: 10672
Change-Id: Ie513c361cff41007f2328cd9ca9ca4800ffef500
Reviewed-on: https://code.wireshark.org/review/5245
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
on the OSX 10.5 buildbot.
Change-Id: I49e066feab8b980ea85371095234e96e89db71e1
Reviewed-on: https://code.wireshark.org/review/5247
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
at least with the trace in Bug 10688 that makes the most sense.
Change-Id: I76213449076a2f49a4b72c6dd87b022fb10b9eef
Reviewed-on: https://code.wireshark.org/review/5242
Reviewed-by: Anders Broman <a.broman58@gmail.com>
"foo.flags..." --> "hiqnet.flags...";
Use BASE_NONE for hf_dchp.
Change-Id: Ic3ca4754a1daeefc831dbfcd6a280fe19f8efbf3
Reviewed-on: https://code.wireshark.org/review/5240
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Use pragma to disable -Wdocumentation when include glib.h, gmodule or gtk/gtk.h
Change-Id: I576c0d5c4a12ac3b505ac9543646356ff29ac814
Reviewed-on: https://code.wireshark.org/review/5198
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Change-Id: Ia4fec86ed389ccb558fe9e1acfb6e87b7012bb75
warning: declaration of 'strlen' shadows a global declaration
Reviewed-on: https://code.wireshark.org/review/5237
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>
Implementation for this event parameter type was missing
Bug: 9626
Change-Id: Iea0bc819858bbf5660d97cfd0c418a963ac149fb
Reviewed-on: https://code.wireshark.org/review/5228
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>
CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools
build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and
update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM.
Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b
Note: CFPropertyListCreateWithStream() works under Mavericks as well.
Reviewed-on: https://code.wireshark.org/review/5226
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
- amqp_1_0_dissectiom: Use MIN(32-bit-length, 0xFFFF) as the length to dissect;
The original code just used the low-order 16 bits of the 32-bit length
field as the length to dissect.
Add an expert warning if the actual PDU length is > 65K.
- tvb_length() --> tvb_reported_length()
Change-Id: I3230600f460a8bd495eeec17fa6e704bf24de1a2
Reviewed-on: https://code.wireshark.org/review/5225
Reviewed-by: Bill Meier <wmeier@newsguy.com>
at the moment, we only use the interface class, even in situations where
it's not applicable (e.g. control request that's not addressed to an
interface or an endpoint) - this is a hack that works because some
dissectors register for interface class "unknown", I'm trying to make
this workaround obsolete
Change-Id: I6bf4253a2f8bf5a75ea1a08c3e52d36f80abd7ab
Reviewed-on: https://code.wireshark.org/review/5215
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Sean Stalley <seanstalley@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Bug: 10641
Change-Id: I51322757c5aa7877fa8ff7915330ff24e7a8cbe2
Reviewed-on: https://code.wireshark.org/review/5221
Reviewed-by: Michael Mann <mmann78@netscape.net>
This improvement avoids use of deallocated memory (crash) if using a
deregistered field in display filter, color filter, custom column and
other cases when the field is used as "interesting field".
This functionality is currently used in http, imf and ldap preferences.
Also removed unused proto_registrar_n() as this does not work correctly
after deregistering fields.
Change-Id: I043e3bf7a98bd773c9801e712a012d1eab8a7f94
Reviewed-on: https://code.wireshark.org/review/5161
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Several fields in cinfo is allocated memory and must be freed here
to avoid memory leakage when recreating the packet list.
Do not allocate memory for col_expr[] as this points to static strings
or other allocated strings.
Change-Id: I840377e3c590b1a3e2a38e0537465a028041d1e9
Reviewed-on: https://code.wireshark.org/review/5137
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
As with the Developer's Guide, add user-guide-docinfo.xml, which lets us
carry over DocBook front matter. Remove the meta_info chapter. Most of
its contents are now in user-guide-docinfo.xml. Add a DocBook revision
history based on hints from the Git/SVN/CVS revision history.
Remove the various makefile targets for converting AsciiDoc files to
DocBook chapters. Remove GPL_appendix.xml. We use the AsciiDoc version.
Change-Id: I543fa2a92f2c735c5f00c97ec65cff2187e09e3a
Reviewed-on: https://code.wireshark.org/review/5216
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Change-Id: Id72fcbe74b91b4eb25fb4d3f3d47a1d53c2857b2
Reviewed-on: https://code.wireshark.org/review/5212
Reviewed-by: Michael Mann <mmann78@netscape.net>
Move the idl2wrs section to the Developer's Guide. Leave most of the
other content intact for now.
Change-Id: I98c6eeab62af5cc55e3ce23ab1107df02b1a22cf
Reviewed-on: https://code.wireshark.org/review/5214
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Change-Id: I94cd7893a2e6b3668499d41519649f6a7782aa60
Reviewed-on: https://code.wireshark.org/review/5213
Reviewed-by: Michael Mann <mmann78@netscape.net>
The chapter is disabled so its final output hasn't been checked. Leave
most of the content intact for now.
Change-Id: I2147ee2863e7ededadf892794a836b4dc8055649
Reviewed-on: https://code.wireshark.org/review/5211
Reviewed-by: Gerald Combs <gerald@wireshark.org>
to AsciiDoc.
``How Wireshark Works'' is disabled, so its final output hasn't been
checked.
Leave most of the content intact for now.
Change-Id: Ia78951faa3ffd9c6d2e23067dbfb954ab4042f60
Reviewed-on: https://code.wireshark.org/review/5210
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Leave most of the content intact for now.
Change-Id: I78f47b8310cb41ac5a07d352e56ec907b36665f8
Reviewed-on: https://code.wireshark.org/review/5209
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Change-Id: I60fd9c6c486b9b3b90e32fb9ccce3973569cc2ee
Reviewed-on: https://code.wireshark.org/review/5204
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: Evan Huus <eapache@gmail.com>
Move it to the Developer's Guide while we're here.
Nudge the markup in epan/wslua where needed. Note that we should
probably convert it to AsciiDoc (if we're going to keep it in the DG) or
Doxygen.
Change-Id: Ie175111043f98b7a37eeeb8d185a833d8e866f8b
Reviewed-on: https://code.wireshark.org/review/5203
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Implementation for this event parameter type was missing
Bug: 9625
Change-Id: I575d387ec4764fa1ecd365624d13e3f41e2473c6
Reviewed-on: https://code.wireshark.org/review/5189
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: Evan Huus <eapache@gmail.com>
Bug: 10676
Change-Id: I5614c640d3fd23196984eb2bb013ba15fb318305
Reviewed-on: https://code.wireshark.org/review/5200
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Guy Harris