aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2017-05-05tnef: fix conflicting entry in its value_stringAlexis La Goutte3-4/+1
Field 'Type' (tnef.property.tag.type) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING)) Change-Id: I306ba69b954f22781bbafe4400993d73c9be5811 Reviewed-on: https://code.wireshark.org/review/21511 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-05mapi: fix conflicting entry in its value_stringAlexis La Goutte3-4/+1
Field 'Value' (mapi.SPropValue.value) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING)) Field 'Value' (nspi.SPropValue.value) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING)) Change-Id: Icc1060804ced2887a34ffe81cf473fbe8154ce18 Reviewed-on: https://code.wireshark.org/review/21510 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-05gsm_sms: fix no previous prototype for ‘proto_reg_handoff_gsm_sms’ ↵Alexis La Goutte1-0/+1
[-Wmissing-prototypes] Change-Id: If580b059d6aae1d69ac32578674491205a7ae21d Reviewed-on: https://code.wireshark.org/review/21517 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-05netlink (nl80211) fix no previous prototype for ↵Alexis La Goutte1-0/+3
‘proto_register_netlink_nl80211/handoff_netlink_nl80211’ [-Wmissing-prototypes] Change-Id: Ife84b7865f7646b3ae8ad0dd3bbf10a679868fce Reviewed-on: https://code.wireshark.org/review/21518 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>
2017-05-05Adding support for the NM protocol.Dr. Lars Voelker3-0/+535
UDP-NM is an automotive communication protocol as standardized by AUTOSAR and is specified in AUTOSAR_SWS_UDPNetworkManagement.pdf, which can be accessed on: autosar.org -> Classic Platform -> Software Arch -> Comm Stack. It can run over UDP or CAN, which is why "UDP" is not in any user exposed strings. Change-Id: I68adfd941c193588a6c8ef0fe1cb7271f921623e Reviewed-on: https://code.wireshark.org/review/21437 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-05-05New Lua function TreeItem:referenced(ProtoField | Dissector).Rado Radoulov1-0/+32
This function returns TRUE/FALSE depending whether the specified ProtoField/Dissector needs to be dissected. By using this function in conjunction with the TreeItem.visible attribute, Lua dissectors can be significantly sped up by making less C interop calls which are relatively slow in terms of dissection especially when using sub-protocols where the dissection of an entire protocol can be skipped. Added tests for TreeItem:referenced to protofield.lua Change-Id: I44feacb91a2a5b0e3c28c0ccd8d6b04cccd67261 Reviewed-on: https://code.wireshark.org/review/21387 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-05nsh: fix stack overflow due to missing length checksPeter Wu1-46/+75
After v2.3.0rc0-3167-ge6f944d632, the NSH dissector could call itself recursively and since the minimum header length was not validated, it could result in a stack overflow due to infinite recursion. Add checks based on the text from https://tools.ietf.org/html/draft-ietf-sfc-nsh-12#section-3.2 This patch also fixes a regression since v2.3.0rc0-3171-g2273cf0e7b where the wrong tvb was passed to subdissectors. Tested with the two captures from bug 11490. Bug: 13612 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1156 Change-Id: I8cacfa267557e8373ff8134f4b020d927e37842f Reviewed-on: https://code.wireshark.org/review/21499 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>
2017-05-05Fix previous change.Guy Harris1-5/+6
Change-Id: I6093d9f5d498c003d14e4f3cec4220eb191d550e Reviewed-on: https://code.wireshark.org/review/21506 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-04Use proto_tree_add_item_ret_uint() for the RFID.Guy Harris1-11/+11
Do some whitespace cleanup while we're at it. Change-Id: I1c55ce916b6d8344736f5732130613f63cf4d60f Reviewed-on: https://code.wireshark.org/review/21502 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-04bootp: fix potential buffer overflow (read)Peter Wu1-1/+2
The Vendor class Identifier is a string (used with strncmp). Be sure to obtain a null-terminated string. Bug: 13628 Change-Id: Ic6457da171fbfa1bd18366d965d22e942fb080d6 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1183 Bug: 13609 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1153 Reviewed-on: https://code.wireshark.org/review/21498 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-05-04dfilter: fix memleak when using value_string valuesPeter Wu1-0/+9
When using a filter such as "ncp.alloc_reply_lvl2 == FALSE", a memory leak would occur as follows: 1. dfilter_fvalue_from_unparsed is called and 2. ends up calling _uint64_from_unparsed 3. which fails with error message "\"FALSE\" is not a valid number.". 4. Next, mk_fvalue_from_val_string is called which maps "FALSE" to 0 5. and the filter is successfully compiled. 6. dfwork_free deliberately does not free the error message (since there should be none at this point) and we have a memleak (from 3). Fix this memleak by clearing the error message when a successful value_string mapping is found. Change-Id: I78d59a4336342b09dc5448ea994b2e1d199d7f3f Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1302 Reviewed-on: https://code.wireshark.org/review/21497 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-05-04ua3g: added SET_SIP_PARAMETERS and FREESEATING messages decodingNicolas BERTIN1-0/+63
Change-Id: I6e00edfa09dea6f9f8c24b72769257ce428bfc61 Reviewed-on: https://code.wireshark.org/review/21481 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-03Put back the null terminator in the list of handles.Guy Harris1-2/+5
The code to scan the list has always required a null terminator, but change 96f517647a8f8b22c66eacf6e3d8bea9d8b8c68f got rid of the null terminator. Change-Id: I13c1553114e08e8617adaf8874ffb5e7c7c4b2d3 Reviewed-on: https://code.wireshark.org/review/21477 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-03Add support for TCP over UDP.Michael Tuexen1-0/+1
Add support to configure a port number for encapsulating TCP packets in UDP. Change-Id: I9aea1eda4537b05e76e76ed0417acb34705bad9e Reviewed-on: https://code.wireshark.org/review/21473 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2017-05-03ua3g: updated SET_PARAM_REQ message decodingNicolas BERTIN1-0/+101
Change-Id: Ic20286111b39539b5c423cc2442be0533d0b631e Reviewed-on: https://code.wireshark.org/review/21468 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-03[mbtcp] Separate conversation and per-packet data, build ppd on firstAndersBroman1-75/+76
pass. Change-Id: I741824b239476a3eafa481344a3f699f986a03c8 Reviewed-on: https://code.wireshark.org/review/20927 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-03TLS13: update HKDF-Expand-Label for draft -20Peter Wu2-9/+22
This is needed for decryption to work in draft -20. Since lots of implementations are still at draft -18, maintain decryption support for older draft versions. Tested with tls13.pcapng (attachment 15156). Change-Id: Ieb7d85136221573007b529b40e4eadc60eac174f Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/21467 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-03TLS13: update Certificate dissection for draft -20Peter Wu1-84/+91
RawPublicKey (RFC 7250) has been incorporated in the Certificate message, update the definition and restructure the code accordingly. No functional change for X.509 certs, but RPK types will now be correctly handled for TLS 1.3 (including the context and extensions). Ran the test suite and tested for regressions using rpk-certficate-message.pcapng from bug 11480. Change-Id: If551a30344851313430201cb6d6198b2091efc2d Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/21466 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>
2017-05-03USB: prevent array bounds overflow from invalid Darwin transfer typeJaap Keuter1-3/+4
During 'Darwin' transfer type conversion the network data is taken as-is, without checking validity. This results in indexing errors. Add validation before using as array index. Bug: 13676 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1307 Change-Id: I24ca49bb21ba36a8d6a3c078ac2c05ded7b8d382 Reviewed-on: https://code.wireshark.org/review/21470 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-03ua3g: updated START_RECORD_RTP message decodingNicolas BERTIN1-0/+4
Change-Id: I98d2aa5098d3019f829e75e46a0842a9d87786aa Reviewed-on: https://code.wireshark.org/review/21469 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-03pdcp-lte: add preference to ignore Set Security AlgorithmBinh Trinh1-0/+12
Useful when captures are already deciphered Change-Id: Ie0f57efa6dccd21d7bd0f25851cbdc8887d7fbbf Reviewed-on: https://code.wireshark.org/review/21443 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-05-03Fix handling of Header IEs.Guy Harris1-6/+11
Add the tree for the type/length/element ID for *all* IEs, whether we know the IE type or not. The total length of the IE is 2 + the value of the length field; always advance by that much. This prevents infinite loops. Fix the name of a field. Bug: 13678 Change-Id: Iadc537653999a4a796c6689b180cf1b75e175035 Reviewed-on: https://code.wireshark.org/review/21472 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-03Add terminating NULL to lists for proto_tree_add_bitmask().Guy Harris2-1/+245
Those lists require null terminators; fix the script to add them, and re-run the script (with the current tip of the master branch for xcbproto and mesa). Change-Id: I76c156521e79753f5c19cae16e9caa031abd2496 Reviewed-on: https://code.wireshark.org/review/21471 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-02scsi: fix conflicting entry in its value_stringAlexis La Goutte2-2/+0
Field 'SPC-2 Opcode' (scsi.spc.opcode) has a conflicting entry in its value_string: 132 is at indices 26 (Receive Copy) and 27 (Receive Copy Results)) Change-Id: I5916bab1bb493226003e86b5a6b693fd4a727499 Reviewed-on: https://code.wireshark.org/review/21458 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-02TLS (1.3): Add new extension 'post_handshake_auth' add on draft 20Alexis La Goutte2-0/+4
The "extension_data" field is zero length. Ping-Bug: 12779 Change-Id: I7a512d7940f55a5edf2c4f71bf1684c3d4e4733a Reviewed-on: https://code.wireshark.org/review/21465 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-05-02TLS: Add support of TLS 1.3 (draft 20)Alexis La Goutte1-0/+1
Ping-Bug: 12779 Change-Id: I6c54f7c4d793a99e448cbfe6b2971cae418f2d39 Reviewed-on: https://code.wireshark.org/review/21464 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-05-02Snort: Ask for needed fields.Martin Mathieson1-2/+10
Doesn't seem to make a difference at the moment, but ask for it regardless. Change-Id: I94ff4f1321b2b2f2cde23f3281a6b79fd7048009 Reviewed-on: https://code.wireshark.org/review/21436 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-02ua3g: updated RESET message decoding (appl_mode, sip_name and reset_mac ↵Nicolas Bertin1-0/+15
parameters) Change-Id: I4604b4de036f5e2d43a6e4f52e64576d63f2c8ed Reviewed-on: https://code.wireshark.org/review/21449 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-02ua3g: updated REDIRECT message decoding (redundant maincpu parameter)Nicolas Bertin1-1/+1
Change-Id: I4c703d380010ed784946a0093307423c227d37eb Reviewed-on: https://code.wireshark.org/review/21450 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2017-05-02nmas (ncp): fix conflicting entry in its value_stringAlexis La Goutte1-5/+5
Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965609 is at indices 56 ((-1687) EVALUATION VERSION WARNING) and 58 ((-1689) THREAD CREATE)) Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965610 is at indices 55 ((-1686) DLL FAILED LOADING) and 59 ((-1690) SECURE CHANNEL REQUIRED)) Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965611 is at indices 54 ((-1685) UNICODE FAILED INIT) and 60 ((-1691) NO DEFAULT USER SEQUENCE)) Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965612 is at indices 53 ((-1684) CODEPAGE FAILED INIT) and 61 ((-1692) NO TREENAME)) Field 'Return Code' (nmas.return_code) has a conflicting entry in its value_string: 4294965613 is at indices 52 ((-1683) DOUBLEBYTE FAILED INIT) and 62 ((-1693) MECHANISM NOT FOUND)) Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965609 is at indices 56 ((-1687) EVALUATION VERSION WARNING) and 58 ((-1689) THREAD CREATE)) Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965610 is at indices 55 ((-1686) DLL FAILED LOADING) and 59 ((-1690) SECURE CHANNEL REQUIRED)) Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965611 is at indices 54 ((-1685) UNICODE FAILED INIT) and 60 ((-1691) NO DEFAULT USER SEQUENCE)) Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965612 is at indices 53 ((-1684) CODEPAGE FAILED INIT) and 61 ((-1692) NO TREENAME)) Field 'Payload Error' (nmas.encrypt_error) has a conflicting entry in its value_string: 4294965613 is at indices 52 ((-1683) DOUBLEBYTE FAILED INIT) and 62 ((-1693) MECHANISM NOT FOUND)) Change-Id: I2bdaa16b04c9d34cfbc5e83ca2b612326216224a Reviewed-on: https://code.wireshark.org/review/21451 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-02mq: fix conflicting entry in its value_stringAlexis La Goutte1-1/+1
Field 'Selector........' (mq.inq.sel) has a conflicting entry in its value_string: 2002 is at indices 221 (MQCA_BASE_Q_NAME) and 222 (MQCA_BASE_OBJECT_NAME)) Change-Id: Ie81b58bf9c32ea38ff5d0808accdd8e9dac3b81a Reviewed-on: https://code.wireshark.org/review/21453 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-02pn532 (rfid): fix conflicting entry in its value_stringAlexis La Goutte1-1/+1
Field 'SAM Mode' (pn532.sam.mode) has a conflicting entry in its value_string: 3 is at indices 2 (Wired Card Mode) and 3 (Dual Card Mode)) Change-Id: I5ee07aff43e2f5ba7a2757057a0da80e2f747541 Reviewed-on: https://code.wireshark.org/review/21455 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-02nettl: fix conflicting entry in its value_stringAlexis La Goutte1-2/+0
Field 'Trace Kind' (nettl.kind) has a conflicting entry in its value_string: 536870912 is at indices 2 (Incoming PDU - PDUIN) and 3 (PDUIN)) Field 'Trace Kind' (nettl.kind) has a conflicting entry in its value_string: 268435456 is at indices 4 (Outgoing PDU - PDUOUT) and 5 (PDUOUT)) Change-Id: I14d47225a4ae83b6667313e5c0ca13e4d4d64831 Reviewed-on: https://code.wireshark.org/review/21452 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-02kerberos: fix conflicting entry in its value_stringAlexis La Goutte2-6/+3
Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 1 is at indices 1 (kRB5-PADATA-TGS-REQ) and 2 (kRB5-PADATA-AP-REQ)) Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 15 is at indices 15 (kRB5-PADATA-PK-AS-REP-19) and 16 (kRB5-PADATA-PK-AS-REQ-WIN)) Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 20 is at indices 21 (kRB5-PADATA-USE-SPECIFIED-KVNO) and 22 (kRB5-PADATA-SVR-REFERRAL-INFO)) Change-Id: I504291b8eb181c9e40d54421f583755cfc4f17db Reviewed-on: https://code.wireshark.org/review/21454 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-02qllc: fix conflicting entry in its value_stringAlexis La Goutte1-2/+1
Field 'Error' (qsig.error) has a conflicting entry in its value_string: 43 is at indices 12 (proceduralError) and 42 (notActivated)) Change-Id: Ic1468f32922644933a79db504a4ecfb6e2289bd2 Reviewed-on: https://code.wireshark.org/review/21457 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-02packet-bzr.c: Prevent infinite loopMichael Mann1-1/+7
Bug: 13599 Change-Id: If85588099d7c6635865614f8778a903a5e971789 Reviewed-on: https://code.wireshark.org/review/21410 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>
2017-05-02Improve the handling of the PLCP header.Guy Harris1-661/+651
Dissect the PLCP headers in a bit more detail, and use bit fields. Use common code. Change-Id: I8711cba71894bebf94f17fdba98b28cc7a620f81 Reviewed-on: https://code.wireshark.org/review/21448 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-05-01Fill in more fields of the 802.11 radio metadata structure.Guy Harris1-31/+125
Also, use #defines for the PLCP type, and add some comments about the PLCP format, and fill in the "short GI" flag from the PLCP header. Change-Id: Ia3c44cc12feb87c181783e9dc37fe0877d1e2a81 Reviewed-on: https://code.wireshark.org/review/21441 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-01Replace some proto_tree_add_uint() calls with proto_tree_add_item().Guy Harris1-30/+21
If we're fetching a value only to use it in proto_tree_add_uint(), we might as well just use proto_tree_add_item(). Change-Id: I504c54f972b2844f57f25c9ffc89c142c8dc495f Reviewed-on: https://code.wireshark.org/review/21440 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-30Remove now-unused variables and code and unnecesary headers.Guy Harris1-14/+0
We're not doing any CRC stuff here - that's the job of the 802.11 dissector, which does it Just Fine - so remove what remains of the stuff for it. Change-Id: If6a0113dec7773b3b4daa7fa014f02c6a97eca0d Reviewed-on: https://code.wireshark.org/review/21433 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-30GSM SMS: use TCAP OTID as last resort for reassembly when GSM MAP does not ↵Pascal Quantin4-109/+131
give info Bug: 13592 Change-Id: Ie13e7466da906e72418c6f9d5ea6f816ff14e129 Reviewed-on: https://code.wireshark.org/review/21425 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-04-30Pass inforation from dissect_ixveriwave() to wlantap_dissect().Guy Harris1-19/+30
Always set log_mode - if the command type is 3, set log_mode to 0, as it's not supplied by the libwiretap code. Pass log_mode and is_octo from dissect_ixveriwave() to wlantap_dissect(). Test is_octo in wlantap_dissect(), just as we do in dissect_ixveriwave(). Change-Id: I536ca59f01e644d55e541df6d2e119db590ae48a Reviewed-on: https://code.wireshark.org/review/21432 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-30Remove a now-unused table.Guy Harris1-10/+0
Change-Id: Ibb04201bd2acd5fa6cbcd7837504b10d1d5174c4 Reviewed-on: https://code.wireshark.org/review/21430 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-30[Automatic update for 2017-04-30]Gerald Combs2-12/+177
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I491517d8801f9b5d3d3084102ed35b418460e4b6 Reviewed-on: https://code.wireshark.org/review/21427 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-30packet-ixveriwave.c: Initialize mgmt_byteMichael Mann1-1/+1
Suppress Ubuntu warning Change-Id: Ia95e19d59b768b6842ca58051ffbd97dce84174c Reviewed-on: https://code.wireshark.org/review/21426 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Uli Heilmeier <openid@heilmeier.eu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-30packet-ieee80211-radio.c: Minor refactor and whitespace cleanupSimon Barber1-316/+306
Change-Id: Idad8f7eeed968eeed9f553fef98d58453f328afb Reviewed-on: https://code.wireshark.org/review/21421 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Michael Mann <mmann78@netscape.net>
2017-04-30Get rid of some unused cruft, and rename an hf_ variable.Guy Harris1-25/+4
Change-Id: Ib74efc765d354b32b40ff298125d4e08f0eb3c2e Reviewed-on: https://code.wireshark.org/review/21420 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-30The encryption type field is part of a 16-bit bitfield.Guy Harris1-1/+1
Set its type accordingly. Change-Id: I3f80828d9e248235db6f4b30f02ada6b6786d25a Reviewed-on: https://code.wireshark.org/review/21419 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-30There's no "FCS is present" flag passed up from libwiretap.Guy Harris1-50/+2
For Ethernet, the FCS is absent; for 802.11, the Series I and II hardware doesn't provide an FCS, but the Series III hardware appears to. Get rid of the flag bit, and a bunch of other dead code (probably inherited by copy-and-paste). Change-Id: I44301c8211c25a5665eb528ac657925931d3f0b4 Reviewed-on: https://code.wireshark.org/review/21418 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-30Series III packets appear to have an FCS at the end.Guy Harris1-4/+4
Change-Id: I9c4ba78cba4cb32a1473c6b8573880f2b56f1fde Reviewed-on: https://code.wireshark.org/review/21417 Reviewed-by: Guy Harris <guy@alum.mit.edu>