diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-08 14:26:09 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-08 14:26:09 +0000 |
| commit | 7e7359b7647018352321f7abdb3141f796423864 (patch) | |
| tree | 019a124a57e5c2e8f72c6bc46b205ec2808c931a /epan | |
| parent | fe568a4feabaaaa5b9fcfc2a44a053162242b6ea (diff) | |
Custom column deprecation:
We fill out the COL_SRCIDX column by using 'pinfo->src_idx'. This member is only set by the MDS Header dissector based on 'mdshdr.srcidx'. So remove COL_SRCIDX and migrate to 'mdshdr.srcidx' custom column.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29794 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/column-utils.c | 5 | ||||
| -rw-r--r-- | epan/column_info.h | 2 | ||||
| -rw-r--r-- | epan/prefs.c | 3 | ||||
| -rw-r--r-- | epan/wslua/wslua_pinfo.c | 1 |
4 files changed, 3 insertions, 8 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index d2ee010e63..3690055ef1 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1481,11 +1481,6 @@ col_fill_in(packet_info *pinfo, gboolean fill_fd_colums) col_set_port(pinfo, i, FALSE, FALSE); break; - case COL_SRCIDX: - g_snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "0x%x", pinfo->src_idx); - pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i]; - break; - case COL_DSTIDX: g_snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "0x%x", pinfo->dst_idx); pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i]; diff --git a/epan/column_info.h b/epan/column_info.h index d07d4b14cf..8843402bd9 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -72,7 +72,7 @@ enum { COL_ABS_TIME, /* 2) Absolute time */ COL_CIRCUIT_ID, /* 3) Circuit ID */ COL_DSTIDX, /* 4) Dst port idx - Cisco MDS-specific */ - COL_SRCIDX, /* 5) Src port idx - Cisco MDS-specific */ + COL_SRCIDX, /* 5) !! DEPRECATED !! - Src port idx - Cisco MDS-specific */ COL_VSAN, /* 6) VSAN - Cisco MDS-specific */ COL_CUMULATIVE_BYTES, /* 7) Cumulative number of bytes */ COL_CUSTOM, /* 8) Custom column (any filter name's contents) */ diff --git a/epan/prefs.c b/epan/prefs.c index 1dae9febc2..cb71aa153f 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1762,7 +1762,8 @@ try_convert_to_custom_column(gpointer *el_data) { COL_REL_CONV_TIME, "tcp.time_relative" }, { COL_DELTA_CONV_TIME, "tcp.time_delta" }, { COL_OXID, "fc.ox_id" }, - { COL_RXID, "fc.rx_id" } + { COL_RXID, "fc.rx_id" }, + { COL_SRCIDX, "mdshdr.srcidx" } }; guint haystack_idx; diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index 7423f76fc9..bf4c4f8627 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -329,7 +329,6 @@ static const struct col_names_t colnames[] = { {"packet_len",COL_PACKET_LENGTH}, {"cumulative_bytes",COL_CUMULATIVE_BYTES}, {"direction",COL_IF_DIR}, - {"src_idx",COL_SRCIDX}, {"dst_idx",COL_DSTIDX}, {"vsan",COL_VSAN}, {"tx_rate",COL_TX_RATE}, |