osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Custom columfication: 

* Deprecate COL_DSCP_VALUE (IP DSCP Value). Use ip.dsfield

svn path=/trunk/; revision=29518
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-23 11:12:12 +00:00
parent 00670c55c6
commit 51ca1739ae
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/column-utils.c
View File

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

1
epan/dissectors/packet-ip.c
View File

@ -1353,7 +1353,6 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
}
iph->ip_tos = tvb_get_guint8(tvb, offset + 1);
col_add_fstr(pinfo->cinfo, COL_DSCP_VALUE, "%u", IPDSFIELD_DSCP(iph->ip_tos));
if (tree) {
if (g_ip_dscp_actif) {

3
epan/prefs.c
View File

@ -1754,7 +1754,8 @@ try_convert_to_custom_column(gpointer *el_data)
{ COL_COS_VALUE, "vlan.priority" },
{ COL_CIRCUIT_ID, "iax2.call" },
{ COL_HPUX_SUBSYS, "nettl.subsys" },
{ COL_HPUX_DEVID, "nettl.devid" }
{ COL_HPUX_DEVID, "nettl.devid" },
{ COL_DSCP_VALUE, "ip.dsfield" }
};
gint haystack_idx;

1
gtk/new_packet_list.c
View File

@ -181,7 +181,6 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo
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 */
case COL_DSCP_VALUE: /* 37) IP DSCP 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 */