diff --git a/epan/column-utils.c b/epan/column-utils.c index d657140481..b9a1c255a6 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1637,7 +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_SUBSYS: /* done by nettl disector */ case COL_HPUX_DEVID: /* done by nettl disector */ break; diff --git a/epan/column.c b/epan/column.c index fbdb2b1540..46ad58356b 100644 --- a/epan/column.c +++ b/epan/column.c @@ -75,7 +75,7 @@ col_format_to_string(gint fmt) { "%F", /* 25) COL_FREQ_CHAN */ "%l", /* 26) COL_BSSGP_TLLI */ "%P", /* 27) COL_HPUX_DEVID */ - "%H", /* 28) COL_HPUX_SUBSYS */ + "%H", /* 28) !! DEPRECATED !! - COL_HPUX_SUBSYS */ "%hd", /* 29) COL_DEF_DL_DST */ "%hs", /* 30) COL_DEF_DL_SRC */ "%rhd", /* 31) COL_RES_DL_DST */ @@ -145,7 +145,7 @@ static const gchar *dlist[NUM_COL_FMTS] = { "Frequency/Channel", /* 25) COL_FREQ_CHAN */ "GPRS BSSGP TLLI", /* 26) COL_BSSGP_TLLI */ "HP-UX Device ID", /* 27) COL_HPUX_DEVID */ - "HP-UX Subsystem", /* 28) COL_HPUX_SUBSYS */ + "HP-UX Subsystem", /* 28) !! DEPRECATED !! - COL_HPUX_SUBSYS */ "Hardware dest addr", /* 29) COL_DEF_DL_DST */ "Hardware src addr", /* 30) COL_DEF_DL_SRC */ "Hw dest addr (resolved)", /* 31) COL_RES_DL_DST */ diff --git a/epan/column_info.h b/epan/column_info.h index 53a11bfecd..6e79387b71 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -94,7 +94,7 @@ enum { 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_SUBSYS, /* 28) HP-UX Nettl Subsystem */ + 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 */ COL_RES_DL_DST, /* 31) Resolved DL dest */ diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c index 9f2e727854..e06848a933 100644 --- a/epan/dissectors/packet-nettl.c +++ b/epan/dissectors/packet-nettl.c @@ -213,9 +213,6 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "nettl"; - if (check_col(pinfo->cinfo, COL_HPUX_SUBSYS)) - col_add_str(pinfo->cinfo, COL_HPUX_SUBSYS, - val_to_str(pinfo->pseudo_header->nettl.subsys, subsystem, "Unknown")); if (check_col(pinfo->cinfo, COL_HPUX_DEVID)) { col_clear(pinfo->cinfo, COL_HPUX_DEVID); col_add_fstr(pinfo->cinfo, COL_HPUX_DEVID, "%4d", diff --git a/epan/prefs.c b/epan/prefs.c index b73ef014e5..b504213a9b 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1752,7 +1752,8 @@ try_convert_to_custom_column(gpointer *el_data) gchar *col_expr; } migrated_columns[] = { { COL_COS_VALUE, "vlan.priority" }, - { COL_CIRCUIT_ID, "iax2.call" } + { COL_CIRCUIT_ID, "iax2.call" }, + { COL_HPUX_SUBSYS, "nettl.subsys" } }; gint haystack_idx; diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index 4c0496f90b..f7fcd7d597 100644 --- 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_subsys",COL_HPUX_SUBSYS}, {"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 b44998805a..7037cd0c35 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -179,7 +179,6 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo case COL_PROTOCOL: /* 48) Protocol */ case COL_INFO: /* 38) Description */ case COL_HPUX_DEVID: /* 27) HP-UX Nettl Device ID */ - case COL_HPUX_SUBSYS: /* 28) HP-UX Nettl Subsystem */ 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 */