diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-23 09:07:54 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-23 09:07:54 +0000 |
| commit | 6b89de83934ba5afc31943ca80c920fef8660dac (patch) | |
| tree | a71d25f4dc106f8db20dbc6fa2ee64fb034a3e5c /epan | |
| parent | dfac9e40914a5d8ff53d0572e45e193e676a291d (diff) | |
Custom columfication:
* Deprecate COL_COS_VALUE (L2 COS Value (802.1p)). Use vlan.priority
svn path=/trunk/; revision=29513
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/column-utils.c | 3 | ||||
| -rw-r--r-- | epan/column.c | 4 | ||||
| -rw-r--r-- | epan/column_info.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-vlan.c | 3 |
4 files changed, 3 insertions, 9 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 363060d0a1..277d9a8319 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -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; diff --git a/epan/column.c b/epan/column.c index 30812f3268..fbdb2b1540 100644 --- a/epan/column.c +++ b/epan/column.c @@ -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 */ diff --git a/epan/column_info.h b/epan/column_info.h index d44f8061d3..53a11bfecd 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -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 */ diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index ddb644bcf5..74216055bc 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -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; |