osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Adjust fc_stat.c to use newer fc_exchange_t structure for its stats. 

svn path=/trunk/; revision=53621
This commit is contained in:
Michael Mann 2013-11-28 14:00:23 +00:00
parent e450b9baae
commit f74c645499
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-fc.c
View File

@ -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){

1
epan/dissectors/packet-fc.h
View File

@ -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;

4
ui/gtk/fc_stat.c
View File

@ -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;
}