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

Display "IP DSCP" column as short text 

Ping-Bug: 12429
Change-Id: I618b2017e161d89f0efa25ce2fb82a1808e8d315
Reviewed-on: https://code.wireshark.org/review/10701
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2015-09-30 14:34:39 +01:00 committed by João Valverde
parent babb9e32e9
commit 9ba9a05ef0
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/column.c
View File

@ -520,7 +520,7 @@ get_column_longest_string(const gint format)
return "0000";
break;
case COL_DSCP_VALUE:
return "00";
return "AAA BBB"; /* not the longest, but the longest is too long */
break;
case COL_TEI:
return "127";

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

@ -2062,8 +2062,8 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
iph->ip_tos = tvb_get_guint8(tvb, offset + 1);
if (g_ip_dscp_actif) {
col_add_fstr(pinfo->cinfo, COL_DSCP_VALUE, "%u",
IPDSFIELD_DSCP(iph->ip_tos));
col_add_str(pinfo->cinfo, COL_DSCP_VALUE,
val_to_str_ext(IPDSFIELD_DSCP(iph->ip_tos), &dscp_short_vals_ext, "%u"));
}
if (tree) {

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

@ -2160,7 +2160,8 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
}
tfc = IPv6_HDR_TCLS(ipv6);
col_add_fstr(pinfo->cinfo, COL_DSCP_VALUE, "%u", IPDSFIELD_DSCP(tfc));
col_add_str(pinfo->cinfo, COL_DSCP_VALUE,
val_to_str_ext(IPDSFIELD_DSCP(tfc), &dscp_short_vals_ext, "%u"));
/* Get extension header and payload length */
plen = g_ntohs(ipv6->ip6_plen);