diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-23 19:40:51 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-24 03:41:28 +0000 |
| commit | bc5a0374bfd162d08834f5f7503bebd33d8ec943 (patch) | |
| tree | 6d5be93a3e35c6eb144ce6d2b1d95650b5cbbd86 /epan/dissectors/packet-m3ua.c | |
| parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.
Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-m3ua.c')
| -rw-r--r-- | epan/dissectors/packet-m3ua.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index d7a60b4eec..a29fb16912 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -1116,22 +1116,22 @@ m3ua_heur_mtp3_standard(tvbuff_t *tvb, packet_info *pinfo, guint32 opc, guint32 case MTP_SI_SCCP: { if (opc < ITU_PC_MASK && dpc < ITU_PC_MASK && - looks_like_valid_sccp(PINFO_FD_NUM(pinfo), tvb, ITU_STANDARD)) { + looks_like_valid_sccp(pinfo->num, tvb, ITU_STANDARD)) { return ITU_STANDARD; } /* Network 0 is reserved in ANSI */ /* Could also check that cluster!=0 for small networks (networks 1-5) */ if ((opc & ANSI_NETWORK_MASK) > 0 && (dpc & ANSI_NETWORK_MASK) > 0 && - looks_like_valid_sccp(PINFO_FD_NUM(pinfo), tvb, ANSI_STANDARD)) { + looks_like_valid_sccp(pinfo->num, tvb, ANSI_STANDARD)) { return ANSI_STANDARD; } - if (looks_like_valid_sccp(PINFO_FD_NUM(pinfo), tvb, CHINESE_ITU_STANDARD)) { + if (looks_like_valid_sccp(pinfo->num, tvb, CHINESE_ITU_STANDARD)) { return CHINESE_ITU_STANDARD; } if (opc < JAPAN_PC_MASK && dpc < JAPAN_PC_MASK && - looks_like_valid_sccp(PINFO_FD_NUM(pinfo), tvb, JAPAN_STANDARD)) { + looks_like_valid_sccp(pinfo->num, tvb, JAPAN_STANDARD)) { return JAPAN_STANDARD; } |