diff options
| author | Moeller, Thies <thies.moeller@baslerweb.com> | 2016-03-15 07:56:57 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-03-15 08:35:21 +0000 |
| commit | 880ac9539154ec09783277c66667d4e6ab629c10 (patch) | |
| tree | 7a196307d9c92045d69c77d8ea902613d09020e5 | |
| parent | 8b8253b8ad40ba429f28c02ac987dfb7e4d0df4f (diff) | |
| download | wireshark-880ac9539154ec09783277c66667d4e6ab629c10.tar.gz wireshark-880ac9539154ec09783277c66667d4e6ab629c10.tar.bz2 wireshark-880ac9539154ec09783277c66667d4e6ab629c10.zip | |
u3v: set interface class/subclass by first clearly identified packet
In case no descriptors are in the trace, payload packets can
only be identified, if a clearly identified STREAM or CONTROL packet sets
class/subclass of the conversation
Change-Id: I30be30df908ede468fadf56fdef20f9869ce6b56
Reviewed-on: https://code.wireshark.org/review/14467
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-u3v.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/epan/dissectors/packet-u3v.c b/epan/dissectors/packet-u3v.c index 8e85a0965e..3359766a74 100644 --- a/epan/dissectors/packet-u3v.c +++ b/epan/dissectors/packet-u3v.c @@ -1695,6 +1695,15 @@ dissect_u3v(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) stream_detected = TRUE; } + /* initialize interface class/subclass in case no descriptors have been dissected yet */ + if ( control_detected || stream_detected){ + if ( usb_conv_info->interfaceClass == IF_CLASS_UNKNOWN && + usb_conv_info->interfaceSubclass == IF_SUBCLASS_UNKNOWN){ + usb_conv_info->interfaceClass = IF_CLASS_MISCELLANEOUS; + usb_conv_info->interfaceSubclass = IF_SUBCLASS_MISC_U3V; + } + } + if ( control_detected ) { /* Set the protocol column */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "U3V"); |