diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-08 14:29:08 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-08 14:29:08 +0000 |
| commit | bc845e056ccf3000e79faf134da547966a410879 (patch) | |
| tree | 0b07e303ba17935ba7bdac9ca378cb3ec51bf5a9 /epan | |
| parent | 62af6eff8450dda6345cf769409a1a5decfac667 (diff) | |
Custom column deprecation:
We fill out the COL_DSTIDX column by using 'pinfo->dst_idx'. This member is only set by the MDS Header dissector based on 'mdshdr.dstidx'. So remove COL_DSTIDX and migrate to 'mdshdr.dstidx' custom column.
svn path=/trunk/; revision=29795
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 3690055ef1..d9ea4e39b1 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_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]; - break; - case COL_VSAN: g_snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "%u", pinfo->vsan); pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i]; diff --git a/epan/column_info.h b/epan/column_info.h index 8843402bd9..0adbf9325c 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -71,7 +71,7 @@ enum { COL_ABS_DATE_TIME, /* 1) Absolute date and time */ COL_ABS_TIME, /* 2) Absolute time */ COL_CIRCUIT_ID, /* 3) Circuit ID */ - COL_DSTIDX, /* 4) Dst port idx - Cisco MDS-specific */ + COL_DSTIDX, /* 4) !! DEPRECATED !! - Dst 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 */ diff --git a/epan/prefs.c b/epan/prefs.c index cb71aa153f..60aec2e018 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1763,7 +1763,8 @@ try_convert_to_custom_column(gpointer *el_data) { COL_DELTA_CONV_TIME, "tcp.time_delta" }, { COL_OXID, "fc.ox_id" }, { COL_RXID, "fc.rx_id" }, - { COL_SRCIDX, "mdshdr.srcidx" } + { COL_SRCIDX, "mdshdr.srcidx" }, + { COL_DSTIDX, "mdshdr.dstidx" } }; guint haystack_idx; diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index bf4c4f8627..f1586e983a 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}, - {"dst_idx",COL_DSTIDX}, {"vsan",COL_VSAN}, {"tx_rate",COL_TX_RATE}, {"rssi",COL_RSSI}, |