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

Custom columfication: 

* Deprecate COL_COS_VALUE (L2 COS Value (802.1p)). Use vlan.priority

svn path=/trunk/; revision=29513
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-23 09:07:54 +00:00
parent dfac9e4091
commit 6b89de8393
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/column-utils.c
View File

@ -1657,9 +1657,6 @@ col_fill_in(packet_info *pinfo, gboolean fill_fd_colums)
case COL_DSCP_VALUE: /* done by packet-ip.c */
break;
case COL_COS_VALUE: /* done by packet-vlan.c */
break;
case COL_FR_DLCI: /* done by packet-fr.c */
case COL_BSSGP_TLLI: /* done by packet-bssgp.c */
break;

4
epan/column.c
View File

@ -86,7 +86,7 @@ col_format_to_string(gint fmt) {
"%x", /* 36) COL_TX_RATE */
"%f", /* 37) COL_DSCP_VALUE */
"%i", /* 38) COL_INFO */
"%U", /* 39) COL_COS_VALUE */
"%U", /* 39) !! DEPRECATED !! - COL_COS_VALUE */
"%rnd", /* 40) COL_RES_NET_DST */
"%und", /* 41) COL_UNRES_NET_DST */
"%rns", /* 42) COL_RES_NET_SRC */
@ -156,7 +156,7 @@ static const gchar *dlist[NUM_COL_FMTS] = {
"IEEE 802.11 TX rate", /* 36) COL_TX_RATE */
"IP DSCP Value", /* 37) COL_DSCP_VALUE */
"Information", /* 38) COL_INFO */
"L2 COS Value (802.1p)", /* 39) COL_COS_VALUE */
"L2 COS Value (802.1p)", /* 39) !! DEPRECATED !! - COL_COS_VALUE */
"Net dest addr (resolved)", /* 40) COL_RES_NET_DST */
"Net dest addr (unresolved)", /* 41) COL_UNRES_NET_DST */
"Net src addr (resolved)", /* 42) COL_RES_NET_SRC */

2
epan/column_info.h
View File

@ -105,7 +105,7 @@ enum {
COL_TX_RATE, /* 36) IEEE 802.11 - TX rate in Mbps */
COL_DSCP_VALUE, /* 37) IP DSCP Value */
COL_INFO, /* 38) Description */
COL_COS_VALUE, /* 39) L2 COS Value */
COL_COS_VALUE, /* 39) !! DEPRECATED !! - L2 COS Value */
COL_RES_NET_DST, /* 40) Resolved net dest */
COL_UNRES_NET_DST, /* 41) Unresolved net dest */
COL_RES_NET_SRC, /* 42) Resolved net source */

3
epan/dissectors/packet-vlan.c
View File

@ -91,9 +91,6 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if ( check_col(pinfo->cinfo, COL_8021Q_VLAN_ID)) {
col_add_fstr(pinfo->cinfo, COL_8021Q_VLAN_ID, "%u", (tci & 0xFFF));
}
if ( check_col(pinfo->cinfo, COL_COS_VALUE)) {
col_add_fstr(pinfo->cinfo, COL_COS_VALUE, "%u", (tci >> 13));
}
vlan_tree = NULL;

1
gtk/new_packet_list.c
View File

@ -186,7 +186,6 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo
case COL_DCE_CTX: /* 10) DCE/RPC connection oriented context id */
case COL_8021Q_VLAN_ID: /* 0) 802.1Q vlan ID */
case COL_DSCP_VALUE: /* 37) IP DSCP Value */
case COL_COS_VALUE: /* 39) L2 COS Value */
case COL_FR_DLCI: /* 24) Frame Relay DLCI */
case COL_BSSGP_TLLI: /* 26) GPRS BSSGP IE TLLI */
case COL_FREQ_CHAN: /* 25) IEEE 802.11 (and WiMax?) - Channel */