osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Custom columfication: 

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

svn path=/trunk/; revision=29517
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-23 10:25:51 +00:00
parent 205129d25c
commit 00670c55c6
7 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/column-utils.c
View File

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

4
epan/column.c
View File

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

2
epan/column_info.h
View File

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

6
epan/dissectors/packet-nettl.c
View File

@ -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");

3
epan/prefs.c
View File

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

1
epan/wslua/wslua_pinfo.c
View File

@ -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}
};

1
gtk/new_packet_list.c
View File

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