diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-11-14 05:47:57 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-11-14 05:47:57 +0000 |
| commit | 12b5181f4654d2006372748c4323f7a39d81cc29 (patch) | |
| tree | f83a45fdb82383594f60123786625bf28cb579a1 /epan/dissectors | |
| parent | e53bccdfca1380021f8a6655abe3cc33da117dd0 (diff) | |
From Stephen Fisher:
a new more accurate fix for bug #1163. Thanks to Graeme Lunt for pointing out that the first patch broke a different capture with legitimate SES data in it. My patch also corrects the check for number of bytes existing from 4 to 2 as the minimum length of an SES PDU is only 2 bytes: 1 byte type, 1 byte length.
svn path=/trunk/; revision=19886
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-ses.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 6ba5dd9739..fa0a4c531f 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -1777,7 +1777,7 @@ dissect_ses_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) guint16 len; /* first, check do we have at least 4 bytes (type+length) */ - if (!tvb_bytes_exist(tvb, 0, 4)) + if (!tvb_bytes_exist(tvb, 0, 2)) return FALSE; /* no */ /* can we recognize session PDU ? Return FALSE if not */ @@ -1789,6 +1789,17 @@ dissect_ses_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) return FALSE; /* no, it isn't a session PDU */ } + /* can we recognize the second session PDU ? Return FALSE if not */ + if(tvb_bytes_exist(tvb, 2, 2)) { /* Make sure there is a second one */ + /* get SPDU type */ + type = tvb_get_guint8(tvb, offset+4); + /* check SPDU type */ + if (match_strval(type, ses_vals) == NULL) + { + return FALSE; /* no, it isn't a session PDU */ + } + } + /* some Siemens SIMATIC protocols also use COTP, and shouldn't be * misinterpreted as SES. * the starter in this case is fixed to 0x32 (SES_MINOR_SYNC_ACK for SES), @@ -1803,8 +1814,6 @@ dissect_ses_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* OK,let's check SPDU length */ /* get length of SPDU */ len = get_item_len(tvb, offset+1, &len_len); - if(len == 0) - return FALSE; /* Not a valid PDU */ /* add header length */ len+=len_len; |