From 3cdaed35ea97c80128cea34632df4c95eae145c3 Mon Sep 17 00:00:00 2001 From: Sake Blok Date: Mon, 29 Oct 2007 06:54:25 +0000 Subject: 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). svn path=/trunk/; revision=23303 --- epan/conversation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan') 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; } -- cgit v1.2.3