diff options
| author | Sake Blok <sake@euronet.nl> | 2007-10-29 06:54:25 +0000 |
|---|---|---|
| committer | Sake Blok <sake@euronet.nl> | 2007-10-29 06:54:25 +0000 |
| commit | 3cdaed35ea97c80128cea34632df4c95eae145c3 (patch) | |
| tree | 9c1e6e1309018c5a18d3158e7bad533ed97f7d07 /epan/conversation.c | |
| parent | b337d20d4c66aaece2de28bc81c77a47c6093fe9 (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).
svn path=/trunk/; revision=23303
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; } |