Custom columfication:

* Deprecate COL_HPUX_DEVID (HP-UX Device ID). Use nettl.devid

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

diff --git a/epan/column-utils.c b/epan/column-utils.c
index b9a1c255a63d622050e07a737e79a9d32e136ea0..e1b3fa970abc5888170e086afce03ff113c1612b 100644 (file)
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -1637,9 +1637,6 @@ col_fill_in(packet_info *pinfo, gboolean fill_fd_colums)
       pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i];
       break;
 
-    case COL_HPUX_DEVID:  /* done by nettl disector */
-      break;
-
     case COL_DCE_CALL:  /* done by dcerpc */
       break;
 

diff --git a/epan/column.c b/epan/column.c
index 46ad58356bc926d03bbc7c08a7c65edf6862c621..710e48c11c3d127a1c44ec2472c357124f103c4d 100644 (file)
--- a/epan/column.c
+++ b/epan/column.c
@@ -74,7 +74,7 @@ col_format_to_string(gint fmt) {
     "%C",                                       /* 24) COL_FR_DLCI */
     "%F",                                       /* 25) COL_FREQ_CHAN */
     "%l",                                       /* 26) COL_BSSGP_TLLI */
-    "%P",                                       /* 27) COL_HPUX_DEVID */
+    "%P",                                       /* 27) !! DEPRECATED !! - COL_HPUX_DEVID */
     "%H",                                       /* 28) !! DEPRECATED !! - COL_HPUX_SUBSYS */
     "%hd",                                      /* 29) COL_DEF_DL_DST */
     "%hs",                                      /* 30) COL_DEF_DL_SRC */
@@ -144,7 +144,7 @@ static const gchar *dlist[NUM_COL_FMTS] = {
     "Frame Relay DLCI",                         /* 24) COL_FR_DLCI */
     "Frequency/Channel",                        /* 25) COL_FREQ_CHAN */
     "GPRS BSSGP TLLI",                          /* 26) COL_BSSGP_TLLI */
-    "HP-UX Device ID",                          /* 27) COL_HPUX_DEVID */
+    "HP-UX Device ID",                          /* 27) !! DEPRECATED !! - COL_HPUX_DEVID */
     "HP-UX Subsystem",                          /* 28) !! DEPRECATED !! - COL_HPUX_SUBSYS */
     "Hardware dest addr",                       /* 29) COL_DEF_DL_DST */
     "Hardware src addr",                        /* 30) COL_DEF_DL_SRC */

diff --git a/epan/column_info.h b/epan/column_info.h
index 6e79387b71e3f1264f72c7415092dd4f844246ba..b666bcbc78047ce61da8f226b1e3f4d5415c595c 100644 (file)
--- a/epan/column_info.h
+++ b/epan/column_info.h
@@ -93,7 +93,7 @@ enum {
   COL_FR_DLCI,        /* 24) Frame Relay DLCI */
   COL_FREQ_CHAN,      /* 25) IEEE 802.11 (and WiMax?) - Channel */
   COL_BSSGP_TLLI,     /* 26) GPRS BSSGP IE TLLI */
-  COL_HPUX_DEVID,     /* 27) HP-UX Nettl Device ID */
+  COL_HPUX_DEVID,     /* 27) !! DEPRECATED !! - HP-UX Nettl Device ID */
   COL_HPUX_SUBSYS,    /* 28) !! DEPRECATED !! - HP-UX Nettl Subsystem */
   COL_DEF_DL_DST,     /* 29) Data link layer dest address */
   COL_DEF_DL_SRC,     /* 30) Data link layer source address */

diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c
index e06848a93390e60e1ac36ab7f1c17b171bcccf0b..3a7eba1f40b9d40579809523e170cd4581d9440c 100644 (file)
--- a/epan/dissectors/packet-nettl.c
+++ b/epan/dissectors/packet-nettl.c
@@ -213,12 +213,6 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
       pinfo->current_proto = "nettl";
 
-      if (check_col(pinfo->cinfo, COL_HPUX_DEVID)) {
-            col_clear(pinfo->cinfo, COL_HPUX_DEVID);
-            col_add_fstr(pinfo->cinfo, COL_HPUX_DEVID, "%4d",
-               pinfo->pseudo_header->nettl.devid);
-      }
-
       if (tree) {
            nettl_item = proto_tree_add_protocol_format(tree, proto_nettl, tvb,
                0, -1, "HP-UX Network Tracing and Logging (nettl) header");

diff --git a/epan/prefs.c b/epan/prefs.c
index b504213a9b192f4ae7439e4bc583648a4645a3ea..a49d5a12593d336bbe47237544b906ca745074d4 100644 (file)
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1753,7 +1753,8 @@ try_convert_to_custom_column(gpointer *el_data)
     } migrated_columns[] = {
         { COL_COS_VALUE, "vlan.priority" },
         { COL_CIRCUIT_ID, "iax2.call" },
-        { COL_HPUX_SUBSYS, "nettl.subsys" }
+        { COL_HPUX_SUBSYS, "nettl.subsys" },
+        { COL_HPUX_DEVID, "nettl.devid" }
     };
 
     gint haystack_idx;

diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c
index f7fcd7d59763e9ec13cfcf3932e3018f03480642..05823baadd1a27d2496056a4d5e414a1c2d582f0 100644 (file)
--- a/epan/wslua/wslua_pinfo.c
+++ b/epan/wslua/wslua_pinfo.c
@@ -336,7 +336,6 @@ static const struct col_names_t colnames[] = {
     {"vsan",COL_VSAN},
     {"tx_rate",COL_TX_RATE},
     {"rssi",COL_RSSI},
-    {"hpux_devid",COL_HPUX_DEVID},
     {"dce_call",COL_DCE_CALL},
     {NULL,0}
 };

diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c
index 7037cd0c35db44f542ae8d0d9224eb81d96b80df..2fc1e586a5f989598c34ec880ee2c890fdb840b8 100644 (file)
--- a/gtk/new_packet_list.c
+++ b/gtk/new_packet_list.c
@@ -178,7 +178,6 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo
                                case COL_IF_DIR:                        /* 21) FW-1 monitor interface/direction */
                                case COL_PROTOCOL:                      /* 48) Protocol */
                                case COL_INFO:                          /* 38) Description */
-                               case COL_HPUX_DEVID:            /* 27) HP-UX Nettl Device ID */
                                case COL_DCE_CALL:                      /* 9) DCE/RPC connection oriented call id OR datagram sequence number */
                                case COL_DCE_CTX:                       /* 10) DCE/RPC connection oriented context id */
                                case COL_8021Q_VLAN_ID:         /* 0) 802.1Q vlan ID */