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

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

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 */

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;

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},