diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:15:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:15:59 +0000 |
| commit | 489b73a4c69e01167e693d7153f973105c613c30 (patch) | |
| tree | 5d72d5ab3cf7dd8efa4e1733579d216d79c8ad66 /epan/dissectors/packet-rtp.c | |
| parent | Releasing progress-linux version 4.2.5-2~progress7.99u1. (diff) | |
| download | wireshark-489b73a4c69e01167e693d7153f973105c613c30.tar.xz wireshark-489b73a4c69e01167e693d7153f973105c613c30.zip | |
Merging upstream version 4.2.6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-rtp.c')
| -rw-r--r-- | epan/dissectors/packet-rtp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 9e34b914..04d68a58 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1238,6 +1238,9 @@ srtp_add_address(packet_info *pinfo, const port_type ptype, address *addr, int p * If not, create a new conversation. */ if (!p_conv || p_conv->setup_frame != setup_frame_number) { + /* XXX - If setup_frame_number < pinfo->num, creating this conversation + * can mean that the dissection is different on later passes. + */ p_conv = conversation_new(setup_frame_number, addr, &null_addr, conversation_pt_to_conversation_type(ptype), (guint32)port, (guint32)other_port, NO_ADDR2 | (!other_port ? NO_PORT2 : 0)); |