diff options
author | sake <sake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-29 06:54:25 +0000 |
---|---|---|
committer | sake <sake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-29 06:54:25 +0000 |
commit | 389dc2f1b4a3edd42a299e9cdc57f93cdd02d335 (patch) | |
tree | 9c1e6e1309018c5a18d3158e7bad533ed97f7d07 /epan/conversation.c | |
parent | 751ccadf0978fea4a26adc5588b89d91ed313931 (diff) |
When there are multiple conversations with the same key, conversation_lookup_hashtable() did not return the correct conversation for the first packet of a conversation (ie when frame_num == conversation->setup_frame).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23303 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/conversation.c')
-rw-r--r-- | epan/conversation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index 95e62c532e..8d1f312389 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -656,7 +656,7 @@ conversation_lookup_hashtable(GHashTable *hashtable, guint32 frame_num, address if (match) { for (conversation = match->next; conversation; conversation = conversation->next) { - if ((conversation->setup_frame < frame_num) + if ((conversation->setup_frame <= frame_num) && (conversation->setup_frame > match->setup_frame)) match = conversation; } |