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>
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>
"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>
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>
- 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>
Change-Id: Id72fcbe74b91b4eb25fb4d3f3d47a1d53c2857b2
Reviewed-on: https://code.wireshark.org/review/5212
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: I94cd7893a2e6b3668499d41519649f6a7782aa60
Reviewed-on: https://code.wireshark.org/review/5213
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
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>
Bug: 10676
Change-Id: I442aa2ce44309655190752e715279d7325647336
Reviewed-on: https://code.wireshark.org/review/5199
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Change-Id: I79ee9413b87722bfe4782342737cff03cfc34495
Reviewed-on: https://code.wireshark.org/review/5179
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: Michael Mann <mmann78@netscape.net>
Change-Id: Ifafdc150c655caf4c7046e3038a6b5e4eeb3cf80
Reviewed-on: https://code.wireshark.org/review/5193
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Change-Id: Ib4a5cc3b783d3a4a1477624678964a9627d582e6
Reviewed-on: https://code.wireshark.org/review/5191
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Change-Id: I5a24de9a12e301d472e701140299304e2cb4fcfc
Reviewed-on: https://code.wireshark.org/review/5190
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
The already frozen packet format of batman-adv for Linux 3.5 was rejected by
David S. Miller. The 4addr format v14 was therefore changed after the freeze
and published in his final form in Linux 3.8.
Change-Id: I519476c4c6d62b403e197fae6a853d9bbe61f9bc
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
Reviewed-on: https://code.wireshark.org/review/5174
Reviewed-by: Michael Mann <mmann78@netscape.net>
In the attached pcap file, there's a single DNS packet with WKS RR in the Prerequisites section.
The Protocol field of this RR is read as if it is 4 bytes long instead of 1, which actually reads part of the bytes of the following RR.
Found by boaz
Bug:10675
Change-Id: Icf12c7f3864b629a242598373c06eee4de0ca098
Reviewed-on: https://code.wireshark.org/review/5170
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This should make it possible to add checkfiltername.pl to the pre-commit script.
Change-Id: Icdee7e4ea3381fa1467bb4b5caf0f60c255adec0
Reviewed-on: https://code.wireshark.org/review/5166
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>
Fixed an error that retransmitted frames were added to the
reassembly table.
Change-Id: I314412cb8f2ce49142e4b7f001613948f5e03bf6
Reviewed-on: https://code.wireshark.org/review/4916
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Note there can be some extra data in the CLID_INUSE case.
(Future work: dissect_nfs_clientaddr4 could use some improvement.)
Ping-Bug: 10649
Change-Id: I92f34c6cc7a9328458f1e4391b04009f5e47290b
Reviewed-on: https://code.wireshark.org/review/5141
Reviewed-by: Bruce Fields <jbrucefields@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
The code checks whether the tag AND class are matching with their expected values, but only the tag information is shown in the error message.
When the class is not matching, the error message shows the given and expected tags which are the same, confusing the user what is wrong with it.
Furthermore, the messages for SEQUENCE and SEQUENCE OF are made the same/similar.
Change-Id: I6c1d0968c903105ec7f6e0648d589a4263a8ca18
Reviewed-on: https://code.wireshark.org/review/5162
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Bug fix: do initial calls to col_...() *before* the dissection code so
that proper column info is displayed even if the dissector
exits early because of an exception, etc.
Cleanup:
- Use wmem_strbuf instead of static fixed length char arrays;
- Create/use an extended value_string;
- Use %u (not %d) when formatting unsigned values;
- Use strchr() to search a string for a character;
- Misc ...
Change-Id: I57ca584f989c3ab1cf141270cc50160f9fb980ae
Reviewed-on: https://code.wireshark.org/review/5153
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Guy Harris