Custom column deprecation:

We fill out the COL_OXID column by using 'pinfo->oxid'. This member is only set by the Fibre Channel dissector based on 'fc.ox_id'. So remove COL_OXID and migrate to 'fc.ox_id' custom column.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29792 f5534014-38df-0310-8fa8-9805f1628bb7

4 files changed, 12 insertions, 17 deletions

diff --git a/epan/column-utils.c b/epan/column-utils.c
index f8f5238449..1835a7ccbd 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_OXID:
-      g_snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "0x%x", pinfo->oxid);
-      pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i];
-      break;
-
     case COL_RXID:
       g_snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "0x%x", pinfo->rxid);
       pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i];
diff --git a/epan/column_info.h b/epan/column_info.h
index 8984cddd4a..b149be2fb8 100644
--- a/epan/column_info.h
+++ b/epan/column_info.h
@@ -89,7 +89,7 @@ enum {
   COL_DEF_DST_PORT,   /* 19) Destination port */
   COL_EXPERT,         /* 20) Expert Info */
   COL_IF_DIR,         /* 21) FW-1 monitor interface/direction */
-  COL_OXID,           /* 22) Fibre Channel OXID */
+  COL_OXID,           /* 22) !! DEPRECATED !! - Fibre Channel OXID */
   COL_RXID,           /* 23) Fibre Channel RXID */
   COL_FR_DLCI,        /* 24) !! DEPRECATED !! - Frame Relay DLCI */
   COL_FREQ_CHAN,      /* 25) IEEE 802.11 (and WiMax?) - Channel */
diff --git a/epan/prefs.c b/epan/prefs.c
index 1ece7f0833..f82fbca967 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1760,7 +1760,8 @@ try_convert_to_custom_column(gpointer *el_data)
         { COL_DSCP_VALUE, "ip.dsfield" },
         { COL_FR_DLCI, "fr.dlci" },
         { COL_REL_CONV_TIME, "tcp.time_relative" },
-        { COL_DELTA_CONV_TIME, "tcp.time_delta" }
+        { COL_DELTA_CONV_TIME, "tcp.time_delta" },
+        { COL_OXID, "fc.ox_id" }
     };
 
     guint haystack_idx;
diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c
index 05823baadd..3c4fdcfdaf 100644
--- a/epan/wslua/wslua_pinfo.c
+++ b/epan/wslua/wslua_pinfo.c
@@ -67,7 +67,7 @@ WSLUA_CLASS_DEFINE(Address,NOP,NOP); /* Represents an address */
 
 WSLUA_CONSTRUCTOR Address_ip(lua_State* L) {
 	/* Creates an Address Object representing an IP address. */
-	
+
 #define WSLUA_ARG_Address_ip_HOSTNAME 1 /* The address or name of the IP host. */
     Address addr = g_malloc(sizeof(address));
     guint32* ip_addr = g_malloc(sizeof(guint32));
@@ -328,7 +328,6 @@ static const struct col_names_t colnames[] = {
     {"info",COL_INFO},
     {"packet_len",COL_PACKET_LENGTH},
     {"cumulative_bytes",COL_CUMULATIVE_BYTES},
-    {"oxid",COL_OXID},
     {"rxid",COL_RXID},
     {"direction",COL_IF_DIR},
     {"src_idx",COL_SRCIDX},
@@ -381,7 +380,7 @@ static int Column__gc(lua_State* L) {
     Column col = checkColumn(L,1);
 
     if (!col) return 0;
-    
+
     if (!col->expired)
         col->expired = TRUE;
     else
@@ -562,7 +561,7 @@ static int Columns_gc(lua_State* L) {
     Columns cols = checkColumns(L,1);
 
     if (!cols) return 0;
-    
+
     if (!cols->expired)
         cols->expired = TRUE;
     else
@@ -706,7 +705,7 @@ static int Pinfo_columns(lua_State *L) {
         luaL_error(L,"expired_pinfo");
         return 0;
     }
-    
+
     cols = g_malloc(sizeof(struct _wslua_cols));
     cols->cinfo = pinfo->ws_pinfo->cinfo;
     cols->expired = FALSE;
@@ -752,7 +751,7 @@ int Pinfo_set_addr(lua_State* L, packet_info* pinfo, pinfo_param_type_t pt) {
         luaL_error(L,"Not an OK address");
         return 0;
     }
-    
+
     if (!pinfo) {
         luaL_error(L,"expired_pinfo");
         return 0;
@@ -793,7 +792,7 @@ int Pinfo_set_int(lua_State* L, packet_info* pinfo, pinfo_param_type_t pt) {
         luaL_error(L,"expired_pinfo");
         return 0;
     }
-    
+
     switch(pt) {
         case PARAM_PORT_SRC:
             pinfo->srcport = (guint32)v;
@@ -947,10 +946,10 @@ static const pinfo_method_t Pinfo_methods[] = {
 
 	/* WSLUA_ATTRIBUTE Pinfo_desegment_offset RW Offset in the tvbuff at which the dissector will continue processing when next called*/
     {"desegment_offset", Pinfo_desegment_offset, Pinfo_set_int,  PARAM_DESEGMENT_OFFSET },
-	
+
 	/* WSLUA_ATTRIBUTE Pinfo_private_data RO Access to private data */
     {"private_data", Pinfo_private_data, pushnil_param, PARAM_NONE},
-	
+
     {NULL,NULL,NULL,PARAM_NONE}
 };
 
@@ -1018,7 +1017,7 @@ static int Pinfo_gc(lua_State* L) {
     Pinfo pinfo = checkPinfo(L,1);
 
     if (!pinfo) return 0;
-    
+
     if (!pinfo->expired)
         pinfo->expired = TRUE;
     else