This does occasionally happen to enumerated vendor ID values for protocols
(company/product line buyouts/acquisitions, etc).
Use "first value" as the vendor ID of choice.
Change-Id: I9a277bf07276809e0684bd3a9f121d4a656d87f6
Reviewed-on: https://code.wireshark.org/review/21137
Reviewed-by: Michael Mann <mmann78@netscape.net>
Problem seems to stem from handling of enum (and that first value has to be 0)
Change-Id: I4c5d749cc53c73988c54f2aa08e60b7f55779348
Reviewed-on: https://code.wireshark.org/review/21136
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Maybe the value_string needs to be broken up into the different pieces.
Change-Id: I1c69ca486eea6d8d8d1ea33d5d0d9eb2e2832ee6
Reviewed-on: https://code.wireshark.org/review/21135
Reviewed-by: Michael Mann <mmann78@netscape.net>
Causes duplication in value_string
Change-Id: Ifdafab2f32f69115dcbb0d1e65604a60a603563c
Reviewed-on: https://code.wireshark.org/review/21134
Reviewed-by: Michael Mann <mmann78@netscape.net>
Flagged during value_string duplication check
Change-Id: Ia6b657b6e0d8e60cf69ea0e40199b78e96837ecc
Reviewed-on: https://code.wireshark.org/review/21133
Reviewed-by: Michael Mann <mmann78@netscape.net>
Looks like it's just a typo.
Change-Id: Ic1fe505a311b423c24f24f2060b8a84c4f577ad3
Reviewed-on: https://code.wireshark.org/review/21132
Reviewed-by: Michael Mann <mmann78@netscape.net>
ETSI EN 300 347-1 V2.2.2 does have the duplicated values
documented. Maybe the value_string needs to be broken up
into the different pieces (PSTN, Control, etc).
Change-Id: I92477d9532d334945cb9e55e75534520d51dd1d1
Reviewed-on: https://code.wireshark.org/review/21131
Reviewed-by: Michael Mann <mmann78@netscape.net>
Comments around the duplicates suggest author was unsure of their
values to begin with.
Change-Id: Idc55e2b6e721e1061d8707ede4faad39901d3085
Reviewed-on: https://code.wireshark.org/review/21130
Reviewed-by: Michael Mann <mmann78@netscape.net>
Values aren't numerically sorted in the XML, so they aren't put
in the value_string in numerical order. That's a problem for
value_string_ext.
Change-Id: Ie40c5ab1083cc7be140d11dc131e3588759819b7
Reviewed-on: https://code.wireshark.org/review/21128
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: I12fcb180fd361f1df4e6d0f78f8f34f01284d7a4
Reviewed-on: https://code.wireshark.org/review/21129
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This reverts commit c63c5c8c42.
This is probably easier than just abandoning it and trying to remove it from my repository.
https://xkcd.com/1597/
Change-Id: Ibba2107cfa9c60c86862b16a4cac31689670e137
Reviewed-on: https://code.wireshark.org/review/21127
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Builds on my machines, physical and virtual, crash with an assertion
failure in the MATE Lemon grammar when parsing the MATE configuration
file in bug 12161 - on Mac OS X Lion with llvm-gcc, Ubuntu 15.10 with
GCC, and on macOS Sierra with clang.
Builds on the macOS buildbot do *not* fail.
So put the result of Lemon in the MATE plugin into the release tarball,
so I can compare it with what Lemon generates on my machine.
Change-Id: I2d5ecee68535a8b4803de0bd7f02d448ab629083
Reviewed-on: https://code.wireshark.org/review/21126
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
VRRP v2 in Cisco routers can use "Keyed MD5" for IP authentication, and
such packets are now dissected slightly better.
The offset of the MD5 digest value pointed out by this patch can be
validated against Cisco's IOU software by using the IOU's "debug vrrp
auth" feature.
Sample VRRP (version 2) .pcap files can be found at,
https://github.com/kholia/my-pcaps
Change-Id: Ib421428bea9c2a074aec4594b26c76bc271fada8
Reviewed-on: https://code.wireshark.org/review/21084
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Change-Id: I5df8cb794b7b76b708448ae4b74b7481bdd8faff
Reviewed-on: https://code.wireshark.org/review/21097
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.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: Martin Mathieson <martin.r.mathieson@googlemail.com>
register.c, and the plugin.c for various plugins, are generated by tools
that must be available to do a build, and aren't distributed as part of
the source tarball. That means "make distclean" should remove them. Do
so.
Change-Id: I9e37abdafb50234cf1ebb5fb828446e45e605d78
Reviewed-on: https://code.wireshark.org/review/21125
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Also convert usage to a value_string_ext
Change-Id: Ie515591355879f8eb65faf50e7c04b30cff13519
Reviewed-on: https://code.wireshark.org/review/21124
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Suboptimal, but still much better than sending columns
for whole capture file. webshark by defaults requests for 120 rows.
Change-Id: I96188e0d2bc4539a57e5061c7784f8c44f318393
Reviewed-on: https://code.wireshark.org/review/20715
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Revert commit 3752a643ac5c85622822c88c69d83ce23828acb8
to fix bug 13164 and bug 13570 introduced with this commit.
This reopens bug 13110.
Bug: 13164
Bug: 13570
Change-Id: Id237f08258ca100f675614a9cb36a32340944b3e
Reviewed-on: https://code.wireshark.org/review/21089
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
That way, you don't end up with "(none)" being used as the filter name
and getting confusing error messages.
Change-Id: Ifc77d4434d82dabebe74118742938cfa5234791d
Reviewed-on: https://code.wireshark.org/review/21118
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Cast an ssize_t value to unsigned int before subtracting it from an
unsigned int. The value is already known to be >= 0 and <= the value
from which we're subtracting it, and that latter value is an unsigned
int, so it's guaranteed to fit into an unsigned int. (ssize_t can be
bigger than unsigned int.)
Change-Id: I5c4d3c7fa4bf241c9ea72661beca89bc30495a3b
Reviewed-on: https://code.wireshark.org/review/21114
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Change-Id: Ib8b80b2c4a79941cf56d8add783c88d1078f079a
Reviewed-on: https://code.wireshark.org/review/21104
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
1. Use FT_UINT_STRING as appropriate
2. Replace many proto_tree_add_xxx_format with proto_tree_add_item[_xxx]
Change-Id: Id9853c54074c2c033b3494b2d687df8e9fd33881
Reviewed-on: https://code.wireshark.org/review/21098
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
FindLibXml2.cmake populates LIBXML2_INCLUDE_DIR and leaves
LIBXML2_INCLUDE_DIRS undefined.
Libxml2 inclusion as optional dependency is suggested in Change-Id
I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783.
Change-Id: If49c778230e99af4b2ebb97dcb2f8acb4b55aa88
Reviewed-on: https://code.wireshark.org/review/21109
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This reduces the differences between our lemon.c and SQLite's.
Change-Id: Ie672fa564a43ffe2fae271968accfed2a864bb63
Reviewed-on: https://code.wireshark.org/review/21107
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That makes the code more like Lemon as distributed.
Note that Lemon, as distributed, at least claims to have a bunch of
stuff "From the file "XXX.{c,h}", which might be the result of lemon.c
being an "amalgamation":
https://www.sqlite.org/amalgamation.html
although, unlike SQLite, the individual bits of the amalgamation don't
appear to be present in the SQLite Fossil repository, so maybe they've
been permanently glued together.
Change-Id: I361d0d16be0744b127110d7d237fdd84e30b6432
Reviewed-on: https://code.wireshark.org/review/21105
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
They accepted some of our changes, but with no space between "struct
XXX" and "*. Whatever.
Change-Id: I6b29462dc8b04ebf0822f8512d82f5f8df575447
Reviewed-on: https://code.wireshark.org/review/21101
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Replace the dash in a range with a '\0', so that the first value in the
range is properly terminated.
Change-Id: Ib2807c2534c1e99e643848ca0fc32f4b78025ce3
Reviewed-on: https://code.wireshark.org/review/21099
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It's not used outside epan/prefs.c, and it probably shouldn't be.
Change-Id: I8a10961a33b93db1de982eec264c134f9f3bc66c
Reviewed-on: https://code.wireshark.org/review/21096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It's not used outside epan/prefs.c, and it *shouldn't* be used outside
epan/prefs.c - there are other APIs that call it, and handle the details
of picking the right name, title, description, etc..
Change-Id: Ib95b4811d50c2bf1c480f115ee998274252243c9
Reviewed-on: https://code.wireshark.org/review/21095
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Add registration of ett fields:
- ett_pcep_obj_unreach_destination,
- ett_pcep_obj_branch_node_capability,
Which were used since 7bca5e1688.
Reorder, ett_ registration to match declaration order.
Change-Id: Ie88cf518a77e134257570a054f6173ee49f27776
Reviewed-on: https://code.wireshark.org/review/21091
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
And make the message for an invalid character in a preference name more
like it, by putting the offending name in quotes.
Change-Id: I40db8b87eae5e46a1d49213a9a45861b6b3565af
Reviewed-on: https://code.wireshark.org/review/21092
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This solves a crash occurring when trying to free memory allocated by
GeoIP (cross-compiled with mingw(32|64)) with MSVC function
Bug: 13598
Change-Id: I757cff13660bd485d7ea91d10660e9bf86404728
Reviewed-on: https://code.wireshark.org/review/21090
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Add millibel unit string, for wireless and optical power useage.
Change-Id: I7fe98fbeea7431fb74db57d2253ea78813379629
Reviewed-on: https://code.wireshark.org/review/21083
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
worth looking at every now and then.
The value of 16384 is the same as the default in VS.
Change-Id: I68fd51e373437088f59c1e197d1a889f856caded
Reviewed-on: https://code.wireshark.org/review/21030
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>
It's copied-and-pasted from {somethingelse}shark.c, such as tshark.c;
it's not needed here.
Fixes CID 1405103.
Clean up indentation while we're at it.
Change-Id: Ia3ab41f64f055fcebeac6e49ebf5f5581125b960
Reviewed-on: https://code.wireshark.org/review/21082
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This structure contains an array of 65536 bytes.
Change-Id: Ied2c584100cb613dc195fbc5de7ae9a5ec5b770b
Reviewed-on: https://code.wireshark.org/review/21077
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>
That's the most recent version of the GeoIP legacy API.
GeoIP 1.6.1, and later, are available from GitHub, but not from
MaxMind's Web site.
Change-Id: I67b1b5b47761beac2fc303e18e39d9accac86e3b
Reviewed-on: https://code.wireshark.org/review/21081
Reviewed-by: Guy Harris <guy@alum.mit.edu>
The payload dissection should start after the header, so do not reset offset.
Fixes: v2.3.0rc0-3039-g92ebd63892 ("netlink: let subdissectors handle the netlink header")
Change-Id: I6bdfdd967bc56cb99c07f4f151ef96592e18a508
Reviewed-on: https://code.wireshark.org/review/21057
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
