diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2016-08-04 16:10:50 +0200 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2016-08-04 15:00:58 +0000 |
| commit | 47e2849ada67ad9d51845c27d4b10479a6dbccf9 (patch) | |
| tree | c4fb727ad8b2ada4b533591279fa53df5c61eb86 /epan/dissectors/packet-opensafety.c | |
| parent | a671bab3373101ce593c78ee1af476719f357028 (diff) | |
openSAFETY: Remove SCM UDID check
This leads to too many false-negatives in certain traces
Change-Id: Ia081dc802b6f55926beec2383a864173cae6eb51
Reviewed-on: https://code.wireshark.org/review/16883
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-opensafety.c')
| -rw-r--r-- | epan/dissectors/packet-opensafety.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index af4befe74f..9a85c8f01d 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -2182,26 +2182,6 @@ opensafety_package_dissector(const gchar *protocolName, const gchar *sub_diss_ha /* Adding second data source */ next_tvb = tvb_new_subset ( message_tvb, frameOffset, frameLength, reported_len ); - if ( type == OPENSAFETY_SPDO_MESSAGE_TYPE ) - { - /* For 16-bit counter frames, this is a check, which will prevent false-positives, where - * only the first frame matches, but the second one does not survive a scm udid sanity check */ - if ( OSS_FRAME_ID_T(message_tvb, byte_offset + frameStart1) != OPENSAFETY_MSG_SPDO_DATA_ONLY ) - { - if ( check_scmudid_validity(packet, next_tvb) == 6 ) - { - /* If the second ID is zero, this actually could be the case, but only, if id is sdn. Even - * if no SCM UDID is known, this will only work with scm_udid_valid = true */ - if ( ! packet->scm_udid_valid ) - { - frameOffset += 2; - found--; - continue; - } - } - } - } - /* Adding a visual aid to the dissector tree */ add_new_data_source(pinfo, next_tvb, "openSAFETY Frame"); |