aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-04-17Fix backwards test.Guy Harris1-1/+1
If fdata->flags.visited *isn't* set, this is the first pass over the packets since opening a file or starting a redissection. Change-Id: Ib72d122c9291ce5ac9c3a3df1b6dfb4db163698e Reviewed-on: https://code.wireshark.org/review/21155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-17Initial support for Linux 802.11 Netlink (nl80211) dissectionPeter Wu6-1/+1139
Only commands and top-level attributes are recognized, no specialization is done (yet?) since it is a large protocol. Fields are extracted from Linux v4.10-rc4-749-g8585989d146c using the "tools/generate-nl80211-fields.py --update" command. Depends on the Generic Netlink (genl) dissector. Change-Id: I7f81b91e3beacca8ebcb853137212406004f65e8 Ping-Bug: 13561 Reviewed-on: https://code.wireshark.org/review/20914 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-17genl: make subdissectors responsible for headerPeter Wu3-21/+47
Allow subdissectors to specify the command field for the Generic Netlink message header, similar to how Netlink subdissectors handle the Netlink message header (for its type field). Pass the root tree instead of the genl tree to subdissectors (so subdissectors can add their own layer). Change-Id: I3e56f538661b7e8a51d2411da14d181ead820c4b Reviewed-on: https://code.wireshark.org/review/21150 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-17Rename some routines and structure members.Guy Harris9-56/+66
They deal with sets of hfids, which can belong to protocols as well as fields (I guess you could argue that a protocol is a field, but...). Change-Id: Ibd103cfa26427ead4ef54be89f1251908004cfae Reviewed-on: https://code.wireshark.org/review/21154 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-17Include protocols in the list of wanted hfids.Guy Harris4-6/+11
That's currently required to get the fields we want. Bug: 12161 Change-Id: Ic1066334358c58fa915ef886b2658902393172c7 Reviewed-on: https://code.wireshark.org/review/21153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-17Consistently call mate_config pointers "mc".Guy Harris3-128/+128
Some routines had "matecfg", some had "mc"; be a bit more consistent. Change-Id: I3406488315483fb281ebc3fb8a23e9e1b2104a14 Reviewed-on: https://code.wireshark.org/review/21152 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-17Make the current MATE config pointer static only to packet-mate.c.Guy Harris5-63/+73
Pass it as an argument to everything else, so only packet-mate.c has the notion of there being *a* configuration, and everything else takes the configuration as an argument. Change-Id: Ia92c1539586d3e71580fd822cf07bd3d79a6f093 Reviewed-on: https://code.wireshark.org/review/21151 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-16noe: improved EVT_LOCAL_APPLICATION message decoding (and updated code to ↵Nicolas Bertin1-7/+14
match previous reviews) Change-Id: I3cf3687303cc582261aa62feef6bd81576965dfd Reviewed-on: https://code.wireshark.org/review/21038 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-16No need for this to be a global variable.Guy Harris1-7/+6
Make it local to mate_tree(), and pass it to mate_pdu_tree(). Change-Id: I489683614b4d65aec3ddd94ce2c9077180e769ca Reviewed-on: https://code.wireshark.org/review/21149 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-16Work around a Lemon bug.Guy Harris1-0/+6
There's a Lemon bug where this grammar produces a parser that fails assertions; to work around it, we disable assert() failures. (A bug report has been sent to sqlite-users about this.) Change-Id: I6812b20fafe318425b37755a15009b0baf2d68a2 Reviewed-on: https://code.wireshark.org/review/21148 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-16X11: Resolve filter differences between a "list" and its "item".Michael Mann2-482/+482
The "list" is of type FT_NONE and the "item" is not. That can cause type conflicts. Change-Id: If62f7113bc120e392588724a0dd65b7ab32ccde7 Reviewed-on: https://code.wireshark.org/review/21146 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-16oss-fuzzshark: search for dissector in given table.Jakub Zawadzki1-5/+32
Change-Id: Ia02b0e6a92213599307e5b382e9fd7ba6c9833a3 Reviewed-on: https://code.wireshark.org/review/21145 Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-04-16MQ: Remove duplicate values from mq_PrmId_xvals.Michael Mann1-4/+4
Appears to be duplicates between "regular" and "64-bit" versions of values. Change-Id: Ib615c0d85c29e11daf5d4379c18563c58ad152f9 Reviewed-on: https://code.wireshark.org/review/21138 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-16packet-hislip.c: Remove duplicate entries from vendorID.Michael Mann1-2/+2
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>
2017-04-16Netlink: Remove duplicate from nfq_ctinfo_valsMichael Mann1-1/+1
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>
2017-04-16packet-qnet6.c: Remove duplicates from qnet6_kif_msg_devctl_cmd_class_vals.Michael Mann1-3/+3
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>
2017-04-16[TACACS] Fix typo with TAC_PLUS_AUTHEN_METH_KRB5Michael Mann1-1/+1
Causes duplication in value_string Change-Id: Ifdafab2f32f69115dcbb0d1e65604a60a603563c Reviewed-on: https://code.wireshark.org/review/21134 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-16[DOCSIS] Fix typo in docsis_conf_code.Michael Mann1-1/+1
Flagged during value_string duplication check Change-Id: Ia6b657b6e0d8e60cf69ea0e40199b78e96837ecc Reviewed-on: https://code.wireshark.org/review/21133 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-16packet-vsip.c: Remove duplicate value in EVsipConfigItem_valsMichael Mann1-1/+0
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>
2017-04-16packet-v52.c: Remove duplicates from info_element_values.Michael Mann1-2/+2
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>
2017-04-16packet-starteam.c: Remove duplicate entries from starteam_opcode_vals.Michael Mann1-16/+16
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>
2017-04-16X11: Revert mesa_enum_ext back to mesa_enumMichael Mann3-260/+258
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>
2017-04-16[GTPv2]: Add Request/Response Lookups for SRVCC PS-to-CS MessagesBinh Trinh1-9/+28
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>
2017-04-16[Automatic update for 2017-04-16]Gerald Combs11-193/+337
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I8165b1b2db0f81049a88dd17163a4367f04f83cc Reviewed-on: https://code.wireshark.org/review/21142 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-16btatt: failed assertion 'hf->bitmask != 0' ↵Alexis La Goutte1-2/+2
(btatt.glucose_measurement.type_and_sample_location.type) Fixes: v1.99.9rc0-246-ga50a49e527 ("Bluetooth: ATT: Add some remaining attributes") Bug: 13590 Change-Id: I8e92ec80ee9e93a3e507f86c8354f1909070b0b9 Reviewed-on: https://code.wireshark.org/review/21041 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>
2017-04-16Revert "Temporary hack to debug the MATE grammar."Guy Harris1-3/+0
This reverts commit c63c5c8c4262c8f58b12f56bf659383a1b0aa47a. 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>
2017-04-16Temporary hack to debug the MATE grammar.Guy Harris1-0/+3
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>
2017-04-16VRRP: Improve dissection of VRRP packets using MD5 authenticationDhiru Kholia1-0/+12
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>
2017-04-16Snort: map more pcre modifiers to GRegexCompileFlagsMartin Mathieson3-8/+43
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>
2017-04-16Get rid of some generated files with "make distclean".Guy Harris15-30/+57
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>
2017-04-16X11: Ensure mesa_enum value_string has unique valuesMichael Mann3-688/+269
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>
2017-04-15sharkd: support for limits in sending information about rows (columns).Jakub Zawadzki1-2/+31
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>
2017-04-15Fix memleak of g_pservices_path.Jakub Zawadzki1-0/+1
Change-Id: Iaee6f3773bc3b4164935092f2c9c9c888171a5b7 Reviewed-on: https://code.wireshark.org/review/21117 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2017-04-15DICOM: Revert 3752a643ac5c85622822c88c69d83ce23828acb8Uli Heilmeier1-1/+1
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>
2017-04-15Catch attempts to pass unregistered protocols to prefs routines.Guy Harris1-0/+8
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>
2017-04-15Squelch some compiler warnings.Guy Harris1-3/+3
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>
2017-04-15packet-slsk.c: Fix potential uninitialized variable.Michael Mann1-1/+1
Change-Id: Ic1ae372bb50192d4503b1d5ba02684f44a51f968 Reviewed-on: https://code.wireshark.org/review/21113 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-15x11: proto_tree_add_uint_format -> proto_tree_add_uint_format_valueMichael Mann8-637/+651
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>
2017-04-15packet-slsk.c: General cleanupMichael Mann1-1063/+770
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>
2017-04-15Add oss-fuzzshark.c tool, for integration with oss-fuzz.Jakub Zawadzki1-0/+301
Change-Id: I8a6b620c8ef1454e57db1d9a6341263ffc9fca3b Reviewed-on: https://code.wireshark.org/review/21110 Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-04-15CMake: include PKG_INCLUDE_DIR if PKG_INCLUDE_DIRS is undefinedAhmad Fatoum1-0/+3
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>
2017-04-15Update to the current lempar.c in the SQLite repository.Guy Harris1-27/+44
Change-Id: I86ca187a7c698541d70bab558c4073fdff28dea3 Reviewed-on: https://code.wireshark.org/review/21108 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-15Make the set of static routines match that in the current tip SQLite.Guy Harris1-17/+15
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>
2017-04-15Update symbols.Guy Harris1-1/+3
Change-Id: I41a075758103f0c37d30b3e764eef5f87e87234f Reviewed-on: https://code.wireshark.org/review/21106 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-15Make memory_error() a routine.Guy Harris1-2/+10
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>
2017-04-15Make whitespace match what's checked into the SQLite repository.Guy Harris1-6/+6
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>
2017-04-15Fix parsing of packet ranges.Guy Harris1-0/+1
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>
2017-04-14Make prefs_register_subtree() static too.Guy Harris2-10/+1
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>
2017-04-14Make prefs_register_module() static.Guy Harris3-20/+1
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>
2017-04-14pcep: add registration of missing ett fieldsJakub Zawadzki1-4/+6
Add registration of ett fields: - ett_pcep_obj_unreach_destination, - ett_pcep_obj_branch_node_capability, Which were used since 7bca5e168817f6f665e9aaec70ca37722c7afbea. 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 16:16:43 +0000