diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-28 14:00:23 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-28 14:00:23 +0000 |
| commit | f74c6454999a93d5f284c97928530a2453fd1361 (patch) | |
| tree | 7abdec8343319fe8423a84e9c3ed8282d1cd6c21 | |
| parent | e450b9baae6196731f911ad30863412f8aa3ed3b (diff) | |
Adjust fc_stat.c to use newer fc_exchange_t structure for its stats.
svn path=/trunk/; revision=53621
| -rw-r--r-- | epan/dissectors/packet-fc.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-fc.h | 1 | ||||
| -rw-r--r-- | ui/gtk/fc_stat.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 25631861b4..7f69314b1f 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -716,6 +716,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC"); fchdr.r_ctl = tvb_get_guint8 (tvb, offset); + fchdr.fc_ex = NULL; /* * If the frame contains a VFT (virtual fabric tag), decode it @@ -1197,6 +1198,8 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean wmem_tree_insert32(fc_conv_data->exchanges, exchange_key, fc_ex); } + fchdr.fc_ex = fc_ex; + /* populate the exchange struct */ if(!pinfo->fd->flags.visited){ if(fchdr.fctl&FC_FCTL_EXCHANGE_FIRST){ diff --git a/epan/dissectors/packet-fc.h b/epan/dissectors/packet-fc.h index db6291ec15..d0283edf9e 100644 --- a/epan/dissectors/packet-fc.h +++ b/epan/dissectors/packet-fc.h @@ -149,6 +149,7 @@ typedef struct _fc_hdr { guint8 r_ctl; guint8 cs_ctl; guint16 lun; + fc_exchange_t* fc_ex; guint32 relative_offset; } fc_hdr; diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c index 45d5443886..e84d7b3cb6 100644 --- a/ui/gtk/fc_stat.c +++ b/ui/gtk/fc_stat.c @@ -81,11 +81,11 @@ fcstat_packet(void *pfc, packet_info *pinfo, epan_dissect_t *edt _U_, const void return 0; } /* if we havnt seen the request, just ignore it */ - if( (!fc->itlq) || (fc->itlq->first_exchange_frame==0) ){ + if ( (!fc->fc_ex) || (fc->fc_ex->first_exchange_frame==0) ){ return 0; } - add_srt_table_data(&fs->fc_srt_table, fc->type, &fc->itlq->fc_time, pinfo); + add_srt_table_data(&fs->fc_srt_table, fc->type, &fc->fc_ex->fc_time, pinfo); return 1; } |