aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mausb.c
AgeCommit message (Collapse)AuthorFilesLines
2016-03-17Associate dissector tables and heuristic subdissector lists with a protocol.Michael Mann1-14/+8
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-22Fix some hf_ field datatype conflicts.Michael Mann1-1/+1
'ieee17221.clock_source_id' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64 'ieee17221.stream_format' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64 'afp.unknown' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES 'afp.toc_offset' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64 'bootp.client_id.iaid' exists multiple times with NOT compatible types: FT_UINT32 and FT_STRING 'bthfp.chld.mode' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8 'canopen.pdo.data' exists multiple times with NOT compatible types: FT_STRINGZ and FT_BYTES 'canopen.sdo.data' exists multiple times with NOT compatible types: FT_UINT32 and FT_BYTES 'ceph.msg.' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'ceph.version' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64 'cip.linkaddress' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8 'dnp3.al.ana' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32 'dnp3.al.anaout' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32 'dtls.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16 'ssl.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16 'dvb-s2_gse.label' exists multiple times with NOT compatible types: FT_UINT24 and FT_ETHER 'fcdns.rply.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8 'fcdns.req.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8 'icmp.int_info.name' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN 'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8 'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'mausb.clear_transfers.status' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE 'mikey.v' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE 'mswsp.rangeboundry.ultype' exists multiple times with NOT compatible types: FT_STRING and FT_UINT32 'mswsp.arrayvector.address64' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'nlm.lock.l_offset' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'nlm.lock.l_len' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'pflog.saddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pflog.daddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pflog.saddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6 'pflog.daddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6 'pgm.spm.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.nak.src' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.nak.grp' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.poll.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.redirect.dlr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 Change-Id: Iaf694699d108a12db172da8dd9fbab211adb329d Reviewed-on: https://code.wireshark.org/review/14070 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-19MAUSB: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+1
Change-Id: I69b21ee05755cf849d52756ef4cad7bb3571762d Reviewed-on: https://code.wireshark.org/review/13327 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-13Enable USB sub-dissectors for MA USB.Sean O. Stalley1-357/+206
MA USB packets with USB payload are now passed into the USB dissector. This allows the payload to be dissected by the USB sub-dissectors. 1. Refactor dissect_usb_common() and put the code needed for finding USB subdissectors into a seperate helper function. 2. Add dissect_usb_payload() call 3. Add dissect_mausb_pkt_common() helper function 4. Put code for dissecting all types of MA USB packets into helper function dissect_mausb_pkt(). 5. Add dissect_mausb_pkt_data() helper function 6. Put code for dissecting MA USB datapacket-specific fields into helper function dissect_mausb_pkt(). 7. Use proto_tree_add_bitmask() call for MA USB bitfields. 8. Create packet-mausb.h to expose MA definitions to USB dissector 9. Dissect MA USB payload with USB subdissectors 10. Undeclare USB calls no longer used by MA USB dissector Change-Id: I456714572cd8dfc9982b087670ca73c17e25a26c Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/13187 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-08Fix a lot of typos and misspellingsmoshekaplan1-1/+1
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3 Reviewed-on: https://code.wireshark.org/review/13069 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>
2016-01-07mausb: Add dissection of ClearTransfers Req & RespSean O. Stalley1-13/+203
Add dissection for two new packets types added in the MA USB v1.0a Specification. Change-Id: Ie693f5d721a446454cc927451b69859e1992ddb3 Reviewed-on: https://code.wireshark.org/review/13081 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2015-12-09new_create_dissector_handle -> create_dissector_handle for dissector directory.Michael Mann1-2/+2
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-07Spelling fixes for errors found by lintianBalint Reczey1-8/+8
Change-Id: I889283902875193f4d3f3fd59788f59f8d9bcc20 Reviewed-on: https://code.wireshark.org/review/11945 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-30mausb: The '&' operator is applied to bool type value found by PVS Studio (V564)Alexis La Goutte1-2/+2
You've probably forgotten to include parentheses or intended to use the '&&' operator Change-Id: Ie9c79729f2ec67aa9579dca40b2e904a9047218f Reviewed-on: https://code.wireshark.org/review/12313 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-30mausb: Fix A part of conditional expression is always true found by PVS ↵Alexis La Goutte1-1/+1
Studio (V560) !del is always true (else if before) Change-Id: I21e335eb3035ec17e990076a4895006d3138f16b Reviewed-on: https://code.wireshark.org/review/12312 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-09Trivial: Change editor-modelines tab-width specification from 4 to 8.Bill Meier1-3/+3
[There were no actual indentation changes since since none of the files contained tabs]. Change-Id: I92ff551e70274f459c466e1c1d449905e0e7dc92 Reviewed-on: https://code.wireshark.org/review/9945 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-03-26USB: use URB/IRP ID for request/response trackingPascal Quantin1-14/+13
Bug: 11072 Change-Id: I5f1824d602e4b88c9c5c8520b0aac9945206f093 Reviewed-on: https://code.wireshark.org/review/7781 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>
2015-02-27Fixed MAUSB Flags subfield dissectionSean O. Stalley1-8/+8
Previously, the version field was being dissected as flags. Change-Id: Ic7d5fd6262e844c9e578dbc29cd5b6e40078ae9f Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/7398 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-27Added basic MA USB isochronous packet supportSean O. Stalley1-18/+255
Iso fields in a MA USB header are now dissected, instead of treating them as non-iso fields. Change-Id: I13c9ba5b0c54ef0b5130c2e87c7de3de9dbe9e22 Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/7397 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-27Added Dissection of CancelTransfer MA packetsSean O. Stalley1-0/+122
Type-specific subfields of CancelTransferReq/Resp are now dissected. Change-Id: I0f03e14df936409125b263409de605dde96d53c0 Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/7396 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-27Updated MAUSB Packet Type valuesSean O. Stalley1-127/+129
Packet type values are now consistant with spec. Also, values in enum mausb_pkt_type are now consistant with mausb_type_string array. Change-Id: I515332bdbc1d1f06bd03e3da314c44d7e842f2f9 Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/7395 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-28Make the USB header information an enumerated type.Guy Harris1-2/+2
It's not really a bitset, it's a choice of one of four types of USB pseudo-header. Make it an enum. Change-Id: I4ea994e1606c23e0a0f08b1b61357eea40a2535e Reviewed-on: https://code.wireshark.org/review/6830 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-27Lua: Expose tcp_dissect_pdus() to LuaHadriel Kaplan1-2/+3
Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus() to make TCP-based dissection easier. Bug: 9851 Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3 Reviewed-on: https://code.wireshark.org/review/6778 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-10USB: Fix Conversation/Endpoint filtersMichal Labedzki1-4/+4
There were not fields for that, so simple add them. Change-Id: I489bae24ac96ea0baf395add731f4d62ccf19352 Reviewed-on: https://code.wireshark.org/review/6401 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-09convert variables that were static just because of SET_ADDRESS macro to use ↵Michael Mann1-3/+1
the proper pinfo->pool instead. Change-Id: I914918d9629f654ead497dddac0f412b690e4409 Reviewed-on: https://code.wireshark.org/review/6430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-4/+1
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-04mausb: Rename expert filter names to fix dup filter names.Bill Meier1-8/+8
Change-Id: Id650c3aff6d073b05e844574ffbde8fec4368f49 Reviewed-on: https://code.wireshark.org/review/5608 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-08remove parent parameter from dissect_usb_setup_response()Martin Kaiser1-2/+2
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>
2014-11-08remove parent parameter from dissect_usb_setup_request()Martin Kaiser1-2/+2
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>
2014-10-28MAUSB: fix warning: no previous prototype for 'proto_register_wfa_oui' ↵Alexis La Goutte1-0/+1
[-Wmissing-prototypes] Change-Id: I86cc9f6f9cd50a6e081aabc10bce077281eb2d76 Reviewed-on: https://code.wireshark.org/review/4959 Reviewed-by: Sean Stalley <seanstalley@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-26Use Wifi Alliance OUI for MA USB packets over SNAPSean O. Stalley1-7/+6
Change-Id: Icf4c995c8fbdb886e8b4e79a1fc7b62ac7137a07 Reviewed-on: https://code.wireshark.org/review/4667 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>
2014-10-09Add Dissection of MA packets over UDPSean O. Stalley1-3/+14
Change-Id: Ic6e1cbb623f3e84b73ce7e4608f291baadc77bf6 Reviewed-on: https://code.wireshark.org/review/4576 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-17Show endpoint direction based on EPHandle bitSean O. Stalley1-1/+1
Interpret the meaning of the endpoint handle direction bit, instead of just saying if it is set. Change-Id: I9fc0d6f95f6c3a94d6db90c8394fe3ca8fc83715 Reviewed-on: https://code.wireshark.org/review/4119 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-27packet-mausb.c: proto-reg-handoff() fixesBill Meier1-6/+8
- proto_reg_handoff...(): Fix handling of tcp port pref change; Rename 'gPORT_PREF' to 'mausb_tcp_port_pref'; Do 'dissector_add_uint("llc.mausb_pid",..)' only once; Change-Id: Ic4498560f61d0ce95f8109c3a1bb3c407221269b Reviewed-on: https://code.wireshark.org/review/3854 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-26Exclude MA USB TransferAck's from USB conversationSean O. Stalley1-1/+6
the usb_trans_info struct only understands Requests & Responses. TransferAcks are currently treated as responses, which throws off the Request/Response pairing & dissection. This patch fixes tracking in the case when a TransferAck & TransferReq are in the same TCP packet. It does not fix the case where there are multiple TransferReq's or TransferResp's in 1 TCP packet. Eventually I want to revamp usb_trans_info structure to support: -multiple requests/responses per transaction (IE: retries) -TransferAck tracking -handling of multiple requests/responses in 1 TCP packet Change-Id: I09be6fecf55a40b4ea2a4f27bd753f3991ccabbd Reviewed-on: https://code.wireshark.org/review/3866 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-26Have dissect_usb_setup_request handle non-standard requestsSean O. Stalley1-4/+5
Moved code for parsing non-standard setup requests from dissect_usb_common() to dissect_usb_setup_request(). Also added header_info flag USB_HEADER_IS_MAUSB & updated mausb dissector. Change-Id: Ifa8abccbd57bf4dd3965f582872952383e6f737d Reviewed-on: https://code.wireshark.org/review/3851 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-25remove trans_info parameter from dissect_usb_endpoint_descriptor()Martin Kaiser1-1/+1
(remove it in the call from mausb as well) add NULL checks for usb_conv_info, usb_trans_info Change-Id: I95d52b85e3fa0d42b6a20047053259aaca8754fe Reviewed-on: https://code.wireshark.org/review/3784 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-25remove trans_info parameter from dissect_usb_unknown_descriptor()Martin Kaiser1-4/+2
remove now unused trans_info variable in mausb Change-Id: I99df8a1ed039134c9448546d0f1a738f203f9610 Reviewed-on: https://code.wireshark.org/review/3785 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-06Added dissection of Device Capability Descriptors in CapResp PacketsSean O. Stalley1-11/+136
CapResp Packets may contain Device Capability Descriptors. This patch allows wireshark to show what descriptors are present, & checks that their length fields are valid. See section 6.3.3 of the MA USB spec for more information. Change-Id: Ia120435bdffcced091b67e66e0ba8f1a750358db Reviewed-on: https://code.wireshark.org/review/3330 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-05Dissection of CapResp PacketsSean O. Stalley1-2/+158
Added dissection of MAUSB Capability Response (CapResp) fields. Change-Id: I41044a25c72b72ef9c8ef5640a609eb6448b054d Reviewed-on: https://code.wireshark.org/review/3329 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-01Fix variable-length managment packet dissectionSean O. Stalley1-0/+5
Before, several managment packets were dissected incorrectly as EPHandleDeleteReq's. Now they are dissected with the generic managment packet dissector. Change-Id: Id2f0951b91b99ba2340ff77c6285f382436788ef Reviewed-on: https://code.wireshark.org/review/3328 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-15MAUSB dissection of control transfer responsesSean O. Stalley1-0/+16
The MAUSB dissector can now dissect transfer responses for control endpoints. Change-Id: Ic488ccb308365d072bbbf0eaf128b198caf74eca Reviewed-on: https://code.wireshark.org/review/2960 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-04Add Bus ID to USB Address ColumnSean O. Stalley1-2/+8
USB Addresses are now in the format of: bus_id.device_address.endpoint This makes it much easier to read traces that captured traffic on more than one bus. Change-Id: I264db2ceea712d94632d5d08d05d3af22a4a03fe Reviewed-on: https://code.wireshark.org/review/2833 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09Dissection of USB setup data in MA USB data packetsSean O. Stalley1-2/+55
This patch adds support for dissection of USB setup data contained inside of MA USB data packets. The MAUSB Dissector calls the same function used by the USB dissector to dissect the setup data. This patch also (and a bit unintentionally) adds transfer following. TransferReq & TransferAck packets now show a link & a time delta to their TransferReq (ie [Request in: XXX] & [Time from request: XXX]. TransferReq packets have a [Response in: XXX] tag, but it erronously points to the TransferAck, not the TransferResponse. Change-Id: I01041de3c38ea6248e9d34506b0b012518a1e6d8 Reviewed-on: https://code.wireshark.org/review/1548 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-07Per Spec update, SetUSBDevAddrReq now contains dataSean O. Stalley1-1/+1
Per MAUSB Spec (1.0), the SetDevAddrReq packet now contains data in addition to the packet header. Change-Id: I4d2c6bb2530edf5de33ef69c0e6af0441e197fa4 Reviewed-on: https://code.wireshark.org/review/2014 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07Removed MAUSB DWORD-Aligned Length CheckSean O. Stalley1-8/+0
Removed a check to see if the Packet is in DWORDs. I misread section 6.2 of the spec, which states that all _headers_ mausb be DWORD-aligned, not all _packets_. Change-Id: I11e320e6e2592930024ffa8143e4d8f470de13ba Reviewed-on: https://code.wireshark.org/review/2013 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06Fixed Fencing for Multiple MAUSB Packets in 1 TCP Packet.Sean O. Stalley1-2/+6
Packet info for all MAUSB packets in a single TCP packet is now displayed in the info column. Before, only info on the last packet was displayed. See conversation for change Ib20e5e30474d93270dd24e203ab96f64f5cc77ad. Patch 3 had fencing, I messed up and left it out of patches 4-6. This patch adds it back in. Change-Id: I37f0e028a8f9b5a8500700f03ac36f8bf1c4f63c Reviewed-on: https://code.wireshark.org/review/1958 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-04Clang complained about non initialized variable.ruengeler1-1/+1
Change-Id: Idc4c1a8db4d5f1b6f2b01428ea283c4a975723f2 Reviewed-on: https://code.wireshark.org/review/1947 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04MAUSB dissector uses USB addressesSean O. Stalley1-0/+41
The MAUSB dissector now prints the USB address for MAUSB data packets in the Source & Destination columns. Before, the IP address was printed. All MAUSB data packets are now part of USB Conversations. Like the USB dissector, all data to & from one endpoint are part of the same conversation. Issues that need to be resolved: - In the case where multiple MAUSB packets exist in one TCP packet, only one USB address can be printed. - The USB conversations do not appear in the conversations window. They should appear under the USB conversations tab. Change-Id: I042daf7889cf70b3bbc450f9ccd974a0f93f4798 Reviewed-on: https://code.wireshark.org/review/1943 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-30Detect multiple MAUSB Packets in a single TCP packetSean O. Stalley1-1/+11
Puts a tag in the info column when multiple MAUSB packets are in a single TCP packet. Change-Id: Ib20e5e30474d93270dd24e203ab96f64f5cc77ad Reviewed-on: https://code.wireshark.org/review/1658 Reviewed-by: Sean Onufer Stalley <sean.stalley@intel.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-24Fixed mausb valid bit & added invalid_valid TFSSean O. Stalley1-1/+1
Fixed valid bit check for MAUSB EPHandleResp packet. the valid bit is active low (ie: valid = 0, invalid = 1). I noticed Some other dissectors also defined an tfs_invalid_valid, so got rid of their local definitions & added it to epan/tfs.c. Change-Id: Ifd78325f9c7c046224073fc9b29e0cc60dc5c286 Reviewed-on: https://code.wireshark.org/review/1766 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-19Remove incorrect _U_ flag in dissect_mausb signatureSean O. Stalley1-2/+1
Removes _U_ flag for data field in dissect_mausb(), since tcp_dissect_pdus(), uses the data field. Change-Id: Iccb5aae1aa203f98484666763410c4a555413ac0 Reviewed-on: https://code.wireshark.org/review/1696 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-12Added dissection of EPHandleDelete Req & Resp packetsSean O. Stalley1-23/+47
Added support for dissecting Media Agnostic USB EPHandleDelete Req & Resp packets. Change-Id: I225a38291c3f47065755c01b336ef75c719e5d58 Reviewed-on: https://code.wireshark.org/review/1546 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-06"Reserved" is not a valid 'fieldconvert' value for an hf.Jeff Morriss1-2/+2
Fixes (for real this time, I swear!) the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10079 Bug: 10079 Change-Id: I2a73ef32d704fc9ecc71fd983fc09cf4f9194b2e Reviewed-on: https://code.wireshark.org/review/1542 Reviewed-by: Sean Onufer Stalley <sean.stalley@intel.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-05-06VALS() doesn't take the address of a (pointer to a) value_string, it takesJeff Morriss1-7/+7
a pointer to a value_string. Fixes the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10079 Bug: 10079 Change-Id: Ifc8d6895cc33ad1f00386a3e59926322bd501125 Reviewed-on: https://code.wireshark.org/review/1538 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 18:46:25 +0000