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

Enhance NSAP and NSAP PTR type 

Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51705
This commit is contained in:
Alexis La Goutte 2013-09-03 06:34:31 +00:00
parent 340ff87d38
commit 4a51170e8d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-dns.c
View File

@ -281,6 +281,7 @@ static int hf_dns_isdn_sa = -1;
static int hf_dns_rt_preference = -1;
static int hf_dns_rt_intermediate_host = -1;
static int hf_dns_nsap_rdata = -1;
static int hf_dns_nsap_ptr_owner = -1;
static int hf_dns_caa_flags = -1;
static int hf_dns_caa_flag_issuer_critical = -1;
static int hf_dns_caa_issue = -1;
@ -3379,7 +3380,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
}
break;
case T_NSAP:
case T_NSAP: /* for NSAP address, NSAP style A record (22) */
{
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
@ -3391,7 +3392,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
}
break;
case T_NSAP_PTR:
case T_NSAP_PTR: /* for domain name pointer, NSAP style (23) */
{
int nsap_ptr_owner_len;
const guchar *nsap_ptr_owner;
@ -3402,9 +3403,9 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
if (data_len < 1) {
goto bad_rr;
}
nsap_ptr_owner_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &nsap_ptr_owner);
proto_tree_add_text(rr_tree, tvb, cur_offset, nsap_ptr_owner_len,
"Owner: %s", format_text(nsap_ptr_owner, strlen(nsap_ptr_owner)) );
proto_tree_add_string(rr_tree, hf_dns_nsap_ptr_owner, tvb, cur_offset, nsap_ptr_owner_len, nsap_ptr_owner);
}
break;
@ -5090,6 +5091,11 @@ proto_register_dns(void)
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_dns_nsap_ptr_owner,
{ "Owner", "dns.nsap_ptr.owner",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_dns_caa_flags,
{ "CAA Flags", "dns.caa.flags",
FT_UINT8, BASE_HEX, NULL, 0x0,