aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-05-28Clean up indentation.Guy Harris1-5/+5
Change-Id: Idfa3e15eaa1d764f66d630878f1c44561169d8bf Reviewed-on: https://code.wireshark.org/review/33409 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-28XRA: PLC can contain multiple MMM messagesBruno Verstuyft1-2/+7
Change-Id: Ic43200df5fe94818ba6fffa4bf2609213777df5f Reviewed-on: https://code.wireshark.org/review/33330 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-28cisco-fp-mim: Properly handle FabricPath header variations (.1Q VLAN)Alexander Koeppe1-110/+118
Under some circumstances, FabricPath frames may be generated during a monitor (capture) session, that contains a modified FabricPath header format in order to retain the ID of the original FabricPath VLAN. To make wireshark capable to dissect such frames, this commit amends the heuristic logic of the dissector and make it work as a heuristic-only dissector Change-Id: I40f6f75a629585ececbc1ce4f94fa61065110d2c Reviewed-on: https://code.wireshark.org/review/33321 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-28Dissect LDAP strings as UTF-8.Guy Harris6-128/+143
This requires some special hackery, including a new packet-ber.c routine, as those strings are just OCTET STRINGs, not UTF8Strings. Change-Id: I776ed47f7400eba366a630b60b94be3397f7b45f Reviewed-on: https://code.wireshark.org/review/33403 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-28Flexray: Add heuristic subdissectionLoSmX2-4/+32
Dissector tries heuristic dissectors too. Preference was added determining if heuristic dissectors should be tried first. Change-Id: Ib70ddca9a33b507b8e4ea89aae5b00961b5273e5 Reviewed-on: https://code.wireshark.org/review/33128 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-28[packet-gelf.c] Add dissector for GELF protocolSlava Bacherikov3-0/+434
Add dissection for Graylog Extended Log Format (GELF) over UDP. Bug: 15776 Change-Id: Ie976a1dee8d3441532f209061aef5c804219f289 Reviewed-on: https://code.wireshark.org/review/33184 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-28docbook: add a link to the gerrit manual explaining change-ids.Dario Lombardo1-1/+4
Change-Id: I775e05bac8b0f8988d503bde6091922d2fab2583 Reviewed-on: https://code.wireshark.org/review/33381 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-28WSUG: Update vlan resolvingUli Heilmeier1-4/+3
Update documentation to profile aware vlans file. Change-Id: I210964528663bdf7e3e20e623eda1d93a26f7486 Ping-Bug: 15795 Reviewed-on: https://code.wireshark.org/review/33387 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-28Clean up some ASCII vs. EBCDIC string handling.Guy Harris1-123/+143
In at least one capture, structure IDs are in ASCII even though the code page in the header is an EBCDIC code page. Determine the structure ID's character encoding based on whether it's the ASCII or EBCDIC version of the ID value, not on the global character encoding. We were using the *integer* encoding, not the *string* encoding, for the "qprotect" field, which is a string; fix that. Use STR_UNICODE for strings, as they're not guaranteed to consist of characters that can be mapped to ASCII characters (even the common subset of EBCDIC, not counting code page-dependent code points, has non-ASCII printable characters in it). Change-Id: I971dd7ae55617c27ebe88f31089b2495374593bf Reviewed-on: https://code.wireshark.org/review/33399 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-28Note, in a comment, some weird characters that appear in wildcards.Guy Harris1-1/+31
At least some NCP operations that do file enumeration take wildcard strings, with special codes for "special" variants of the asterisk and question mark wildcards and the component separator period. We should figure out how to display those "special" characters (put an overbar above them, or something such as that?) Change-Id: I4e455f47ae3a701004fe7989b44b64a77b26e828 Reviewed-on: https://code.wireshark.org/review/33398 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-28Strings in mDNS TXT records are UTF-8.Guy Harris1-2/+2
Change-Id: Iedde17155aae71e9bc7ad3cc5185ea33e34e209c Reviewed-on: https://code.wireshark.org/review/33391 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-28Strings in the CUPS browsing protocol are UTF-8.Guy Harris1-6/+6
Change-Id: I594a22acf9202f7b7ca2e4ee3c58c308c2cd7019 Reviewed-on: https://code.wireshark.org/review/33390 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-27VLAN resolving: use existing file_exists() functionUli Heilmeier1-12/+1
Use existsing file_exists() function to check if the profile contains a vlans file. Change-Id: Ibc3d32b27059edd80b7c4e88ceb48fded2334909 Reviewed-on: https://code.wireshark.org/review/33384 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-05-27VLAN resolving: check profile firstUli Heilmeier1-3/+20
If the profile directory contains a vlans file we will use it. Otherwise fall back to normal user preferences. Bug: 15795 Change-Id: Ie6a63a6f7a29bd83a15799875aa5883be7010039 Reviewed-on: https://code.wireshark.org/review/33378 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-27RANAP: Handle 7 byte NSAP address in transportLayerAddressPiotr Tulpan3-127/+155
Handle NSAP 7 byte IPv4 address in transportLayerAddress field which aren't padded to 20 bytes. Change-Id: Ied9a9549612fe8e9ec511419ee0d7e5ae06bcedf Reviewed-on: https://code.wireshark.org/review/33278 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-26Windows: upgrade USBPcap to 1.4.0.0Pascal Quantin2-5/+5
Change-Id: I79b8ece52e89e4e646954e965649b0cf5ae69a6a Reviewed-on: https://code.wireshark.org/review/33379 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-26blip: fix used-but-marked-unused warningsMartin Kaiser1-2/+2
blip.c:195:4: error: 'offset' was marked unused but was used offset, ^ blip.c:200:22: error: 'blip_tree' was marked unused but was used proto_tree_add_item(blip_tree, hf_blip_ack_size, tvb, offset, varint_ack_size_length, ENC_VARINT_PROTOBUF); ^ blip.c:200:56: error: 'offset' was marked unused but was used proto_tree_add_item(blip_tree, hf_blip_ack_size, tvb, offset, varint_ack_size_length, ENC_VARINT_PROTOBUF); ^ blip.c:202:2: error: 'offset' was marked unused but was used offset += varint_ack_size_length; ^ blip.c:284:14: error: 'pinfo' was marked unused but was used col_set_str(pinfo->cinfo, COL_PROTOCOL, "BLIP"); ^ blip.c:286:12: error: 'pinfo' was marked unused but was used col_clear(pinfo->cinfo,COL_INFO); ^ blip.c:333:14: error: 'pinfo' was marked unused but was used col_add_str(pinfo->cinfo, COL_INFO, col_info); ^ blip.c:337:34: error: 'pinfo' was marked unused but was used return handle_ack_message(tvb, pinfo, blip_tree, offset, value_frame_flags); ^ blip.c:346:45: error: 'pinfo' was marked unused but was used conversation = find_or_create_conversation(pinfo); ^ blip.c:361:4: error: 'pinfo' was marked unused but was used pinfo, ^ blip.c:380:27: error: 'pinfo' was marked unused but was used tvb_to_use = decompress(pinfo, tvb, offset, tvb_reported_length_remaining(tvb, offset) - BLIP_BODY_CHECKSUM_SIZE); Change-Id: I9de1a78942469cc16011fd1a21d93b81820bee80 Reviewed-on: https://code.wireshark.org/review/33373 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-26dhcp: fix used-but-marked-unused warningsMartin Kaiser1-6/+6
dhcp.c:3087:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be >= 10"); ^ dhcp.c:3119:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4"); ^ dhcp.c:3131:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4"); ^ dhcp.c:3143:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4"); ^ dhcp.c:3155:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must >= 1"); ^ dhcp.c:3176:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must >= 5"); ^ dhcp.c:3201:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4"); Change-Id: If4e05284a4489e7cea75fee52733851533dacbc1 Reviewed-on: https://code.wireshark.org/review/33372 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-26dot11decrypt: fix a used-but-marked-unused warningMartin Kaiser1-1/+1
dot11decrypt.c:1686:46: error: 'group_cipher' was marked unused but was used &group_cipher, &cipher, &akm); Change-Id: Ie7b9eba44eaf9bf160ca6eb6bb7373b7ba3fd8cb Reviewed-on: https://code.wireshark.org/review/33371 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-26rbm: fix a bunch of used-but-marked-unused warningsMartin Kaiser1-3/+3
file-rbm.c:143:34: error: 'tree' was marked unused but was used proto_tree_add_int_format_value(tree, hf_rbm_integer, tvb, *offset, len, value, "%d", value); ^ file-rbm.c:374:23: error: 'offset' was marked unused but was used gint offset_start = *offset; ^ file-rbm.c:375:48: error: 'tree' was marked unused but was used proto_tree* drb_tree = proto_tree_add_subtree(tree, tvb, *offset, 0, ett_variable, NULL, "Objects"); ^ file-rbm.c:375:54: error: 'tvb' was marked unused but was used proto_tree* drb_tree = proto_tree_add_subtree(tree, tvb, *offset, 0, ett_variable, NULL, "Objects"); ^ file-rbm.c:375:60: error: 'offset' was marked unused but was used proto_tree* drb_tree = proto_tree_add_subtree(tree, tvb, *offset, 0, ett_variable, NULL, "Objects"); ^ file-rbm.c:376:21: error: 'tvb' was marked unused but was used dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL); ^ file-rbm.c:376:26: error: 'pinfo' was marked unused but was used dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL); ^ file-rbm.c:376:43: error: 'offset' was marked unused but was used dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL); ^ file-rbm.c:377:21: error: 'tvb' was marked unused but was used dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL); ^ file-rbm.c:377:26: error: 'pinfo' was marked unused but was used dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL); ^ file-rbm.c:377:43: error: 'offset' was marked unused but was used dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL); ^ file-rbm.c:378:32: error: 'offset' was marked unused but was used proto_item_set_len(drb_tree, *offset - offset_start); ^ file-rbm.c:526:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_rbm_version_unsupported, "Version %u.%u is not supported (only %u.%u)", Change-Id: Id255df237c43c313720797a46c0e877f0f7550e0 Reviewed-on: https://code.wireshark.org/review/33370 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-26rfc7468: fix a used-but-marked-unused warningMartin Kaiser1-1/+1
file-rfc7468.c:428:39: error: 'data' was marked unused but was used dissect_rfc7468(tvb, pinfo, tree, data); Change-Id: I938f30edfc7cf952eadbd0cf79e4cc95bb971b2e Reviewed-on: https://code.wireshark.org/review/33369 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-26*Always* pair ENC_UTF_16 and ENC_UCS_2 with a byte order.Guy Harris2-9/+9
Big-endian and little-endian UTF-16 and UCS-2 aren't the same; always associate them with a byte order ENC_ flag, to clarify what byte order is being used. Yes, for big-endian, omitting the ENC_ flag, or using ENC_NA, *happens* to work, because ENC_BIG_ENDIAN and ENC_NA *happen* to be 0, but omitting ENC_BIG_ENDIAN doesn't make it sufficiently clear that it's UTF-16BE or UCS-2BE. Change-Id: Iecf7375763ce4922bd1b0676c9dc5a01731c2fec Reviewed-on: https://code.wireshark.org/review/33374 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-26wslua: fix error handling for invalid dissector tableMartin Kaiser1-1/+1
Calling DissectorTables's try method for a dissector table of an unknown type crashes Wireshark. local dt = DissectorTable.get("iso14443.subdissector") dt:try(0, tvbuf, pinfo, tree) causes a segmentation fault Thread 1 "wireshark" received signal SIGSEGV, Segmentation fault. except_pop () at /media/sf_wireshark.git/epan/except.c:264 264 set_top(top->except_down); (gdb) print top $1 = (struct except_stacknode *) 0x2 (gdb) bt at /media/sf_wireshark.git/epan/packet.c:590 My gut feeling (I haven't verified this) is that we should not call luaL_error() inside a TRY-CATCH block. DissectorTable_try does this when the type of the dissector table is not supported. Fall back to the data dissector in this case and bring up an expert info instead of aborting the dissection completely. Change-Id: I9a49f738a99b2618014f41050d8c0bf6bfbb4138 Reviewed-on: https://code.wireshark.org/review/33357 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-26[Automatic update for 2019-05-26]Gerald Combs5-36/+144
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Id9b3a2433d1e2995d3937a1ec912ae8945c13dad Reviewed-on: https://code.wireshark.org/review/33364 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-26Copy selected lines from Packet List view for existing formats.Arvind Dalvi1-23/+32
For all platforms that is supported by Qt framework... - Select copy/<options> from context menu and it will copy selected lines. Note: This change implements part 1 of another change, # 33007. And has been tested on Windows 10 only. Change-Id: Iba2668d7c411aa33de77003fe116e63e6f650b3d Reviewed-on: https://code.wireshark.org/review/33074 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-26gsm_sim: fix conflictAlexis La Goutte1-1/+1
'gsm_sim.apdu.cla.secure_messaging_ind' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8 Change-Id: Iff6e05d5e2c1309a62e026099bc90f8cb8a9b803 Reviewed-on: https://code.wireshark.org/review/33352 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-26wslua: print the correct type for FT_NONE dissector tablesMartin Kaiser1-0/+5
We added FT_NONE dissector tables a while ago. These tables can only be used for Decode As. Support such dissector tables in lua's print() function. print(DissectorTable.get("iso14443.subdissector")) will now print DissectorTable iso14443.subdissector only for Decode As: Change-Id: I9f5a2f6d6b1edb2a53ca1d2c0ae158c16fddf05f Reviewed-on: https://code.wireshark.org/review/33356 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-25Strengthen the "is the FTP data text?" heuristic.Guy Harris1-1/+1
Check up to 20 characters, not up to 10 characters. Change-Id: Ief626dd1ee22e2d75455769a1df2dad853dff04a Reviewed-on: https://code.wireshark.org/review/33360 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-25Developers Guide: Fix issue with Windows env varsGraham Bloice1-6/+0
Change-Id: I2f78cf59267196c2994f7f16934562074afa9f4f Reviewed-on: https://code.wireshark.org/review/33358 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2019-05-25Ask, in a comment, how to distinguish integer from string tag names.Guy Harris1-0/+5
Change-Id: I6b71ffda03e207c97ca39e37d8da2f440b01b680 Reviewed-on: https://code.wireshark.org/review/33359 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-25iso14443: we reassemble APDUs, not TPDUsMartin Kaiser1-12/+12
Fix the field names and the filter strings accordingly. Change-Id: I4275abc04962a364dfea2ea76ca9877d82e0ae06 Reviewed-on: https://code.wireshark.org/review/33354 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2019-05-25AERON: Properly handle heartbeat frame lengthJaap Keuter1-7/+8
The aeron hartbeat frame is a data frame with zero length. The rounded length is used to report back consumed bytes. Set that to the real length of a heartbeat frame, being 24. Sample captures show trailing zero bytes after a heartbeat frame. Make sure trailing zero bytes are not tested for additional frames. CID 1439592 Change-Id: I99580179830b6de0886a1d57f994f4a9c5a1ae6d Reviewed-on: https://code.wireshark.org/review/33243 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2019-05-25iso14443: (trivial) i_block_frag_items is usedMartin Kaiser1-1/+1
remove the _U_ tag Change-Id: Id0cfb160903cf3a72adee20fa5c388d68c991a56 Reviewed-on: https://code.wireshark.org/review/33353 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2019-05-25Use the OEM code page to set the encoding for "ANSI" strings.Guy Harris1-6/+25
Change-Id: Ib6c85c5c50741ff9b38484a99f96e67a1de1a6c7 Reviewed-on: https://code.wireshark.org/review/33351 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-25*Little-endian* UTF-16.Guy Harris1-1/+1
ENC_UTF_16 does *not* go with ENC_NA; ENC_NA is for cases where the byte order is "not applicable", such as a 1-byte number or a character encoding where every character is encoded in 1 byte, but UTF-16 isn't one of those cases, as a character is encoded in either 1 or 2 2-byte values. This being a Windows thing, the byte order is little-endian. Change-Id: Iab0db3fa2c5d2c25be209e4ed0ebd57827edbcd8 Reviewed-on: https://code.wireshark.org/review/33347 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-25"OEM Codepage" appears to mean "code page number"; show it in decimal.Guy Harris1-1/+1
Code page numbers are generally referred to by their number in decimal, not hex. Change-Id: I1dee3df09cf7b5efaca2f4144ee5fcbc8d3ee44c Reviewed-on: https://code.wireshark.org/review/33343 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-25Add Windows code page 1252.Guy Harris4-6/+76
While we're at it, add the Euro to code page 1251, expand the comments for 1250 and 1251 and some DOS code pages, and add support for code page 1251 to tvb_get_stringz_enc(). Change-Id: I053d58f87cac26ad7c109e2f1cd8807ffec0622d Reviewed-on: https://code.wireshark.org/review/33342 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-24"Zigbee" encoding is not a character encoding or an integer encoding.Guy Harris2-12/+16
It's a rule for interpretation of the length field of counted-string and counted-octet-string fields. This means it's 1) not a general rule for interpreting integers and 2) not a character encoding, as it also applies to octet strings and, even for character strings, it's *orthogonal* to the character encoding. Therefore, it should *not* be one of the character encoding values; it should be a bit flag. Make it so. This means that 1) a character encoding can be specified for Zigbee Cluster Library strings (they appear to have multiple character encodings possible); 2) the test of it that tested it as if it were a flag will no longer get confused by character encodings that set one or more of the bits in the old encoding value; 3) you don't have to special-case the encoding value passed to get_uint_value(). Put in a comment emphasizing that values that aren't character encodings should *not* be placed in the set of character encodings. Change-Id: I8f50aaee8ca60b0781044287e9b38111de38c81f Reviewed-on: https://code.wireshark.org/review/33341 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-24CMake+macOS: Use symlinks for our CLI utilities.Gerald Combs2-14/+21
On macOS, <build directory>/run/wireshark is a wrapper script that execs run/Wireshark.app/Contents/MacOS/Wireshark so that Launch Services will activate our application properly. We don't need to worry about this for our other executables. Make them symlinks so that we can run things like `lldb run/tshark` with impunity. Change-Id: I4e656d778040ece722f873b1a7f6e6e60d21e2a6 Reviewed-on: https://code.wireshark.org/review/33071 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-24Qt: unchecked dynamic castJaap Keuter1-2/+2
Dynamic cast may yield NULL pointer, hence must be checked before dereferencing it. Easy enough in a conditional. CID 1435488 Change-Id: I8359ab5865795f1b1bea6980b023ff636d6719a6 Reviewed-on: https://code.wireshark.org/review/33316 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-24wsutil+macOS: Use realpath() to resolve our program path.Gerald Combs1-1/+16
Use realpath() to resolve our program file directory on macOS. This lets us create symlinks to the program files in our application bundle without affecting our plugin and other paths. Change-Id: If77cbd7da56e01f2cd602334d361c8aa52afeae0 Reviewed-on: https://code.wireshark.org/review/33151 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-24couchbase: Remove 2nd seqno from DCP_{COMMIT,ABORT,SEQNO_ACK}Dave Rigby1-13/+18
DCP_COMMIT, DCP_ABORT and DCP_SEQNO_ACK no longer include two seqnos, just a single one. Add missing status codes for durability-related statuses. Change-Id: I97b847dd43c59405d69410ef28b0b362111c0fbd Reviewed-on: https://code.wireshark.org/review/33339 Reviewed-by: Ben Huddleston <ben.huddleston@couchbase.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-24gprscdr: update RatingGroupId as unsignedJoakim Karlsson2-1/+2
Changed type for the RatingGroupId fields, from signed32 to unsigned32. This fixes the problem of getting "-1" values at G_MAXUINT32. Change-Id: Ia1113901657bedc8d9c231aa1fe38b63170b2257 Reviewed-on: https://code.wireshark.org/review/33338 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-24Add support decode extremeNetworks-avaya access point TLVszhongweisitu2-2/+138
Uploaded a LLDP test file, Bug 15793 Change-Id: I65bdf496df64a5a957b132a402c6535bec60cf84 Reviewed-on: https://code.wireshark.org/review/31598 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-24DOCSIS: OCD Cyclic Prefix: typo fixBruno Verstuyft1-2/+2
Change-Id: I5c8db7d4f6b2a400f844d23a7d4ed596c8438cc7 Reviewed-on: https://code.wireshark.org/review/33332 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-24pfcp: correction of PFD Contents IEJoakim Karlsson1-11/+18
wrong offset was used in the Additional entries Change-Id: I408de47e31c2faec5fbc7f8c562949b1a5c348e9 Reviewed-on: https://code.wireshark.org/review/33336 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-24dumpcap: use typedefs instead of structs.Dario Lombardo1-26/+26
pcapng.h defines some typedefs for its structs for more readability. Use them in dumpcap. Change-Id: I7f4cc47819314732ddcd5076b38f68c52aedb071 Reviewed-on: https://code.wireshark.org/review/33329 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-24developers-guide: restore winflexbison to Windows installGraham Bloice1-23/+38
Change-Id: I46d0822b2939793990b7e0ef6a34bd421335c919 Reviewed-on: https://code.wireshark.org/review/33337 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-23NAS EPS: fix compile error on older GCCJoakim Karlsson1-1/+1
error: variable ‘handle’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] Change-Id: I2c08b9f34171dfb9fc31b1651d1e66a268274b6d Reviewed-on: https://code.wireshark.org/review/33335 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-23NAS EPS: catch exception when using ESM data container heuristicPascal Quantin1-19/+23
This way if we try to decode non IP data as IP (due to preference setting), this does not prevent the end of the packet from being dissected. While we are at it, let's improve the heuristics. Change-Id: Ic5b76cd84554fcbd10c3cf59294783933196163a Reviewed-on: https://code.wireshark.org/review/33331 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 18:55:06 +0000