diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-07-08 16:54:18 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-07-08 16:54:18 +0000 |
| commit | 59644b38992b5ec556fcba348a4f3452199dbc2d (patch) | |
| tree | cd42e84c3438a0903a94391e315bc4141d129fd3 /epan/conversation.c | |
| parent | 5b7c3b31051c112c3ffa9e43d9e9fe701d028978 (diff) | |
New Qt feature: Show related packet list items in the frame number
column. Conversation spans (setup frame to last frame) are shown with a
square bracket. Linked frames are shown with a circle.
Use correct column justifications in Qt. Move common
justification-related packet list code to ui/packet_list_utils.[ch].
Add a last_frame element to conversation_t.
svn path=/trunk/; revision=50447
Diffstat (limited to 'epan/conversation.c')
| -rw-r--r-- | epan/conversation.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index 1164769c79..d2beee7810 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -650,7 +650,7 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address memset(conversation, 0, sizeof(conversation_t)); conversation->index = new_index; - conversation->setup_frame = setup_frame; + conversation->setup_frame = conversation->last_frame = setup_frame; conversation->data_list = NULL; /* clear dissector handle */ @@ -1242,7 +1242,11 @@ find_or_create_conversation(packet_info *pinfo) /* Have we seen this conversation before? */ if((conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, - pinfo->destport, 0)) == NULL) { + pinfo->destport, 0)) != NULL) { + if (pinfo->fd->num > conv->last_frame) { + conv->last_frame = pinfo->fd->num; + } + } else { /* No, this is a new conversation. */ conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, |