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

Show IPv4/IPv6 addresses as such. 

svn path=/trunk/; revision=22147
This commit is contained in:
Anders Broman 2007-06-20 21:56:03 +00:00
parent 607b0b1048
commit a80b9c8e41
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/ulp/ulp.cnf
View File

@ -54,4 +54,8 @@ guint32 UlpMessage;
if (rrlp_tvb && rrlp_handle) {
call_dissector(rrlp_handle, rrlp_tvb, %(ACTX)s->pinfo, tree);
}
#.TYPE_ATTR
IPAddress/ipv4Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL
IPAddress/ipv6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL
#.END

5
epan/dissectors/packet-ulp.c
View File

@ -1852,6 +1852,7 @@ dissect_ulp_T_rrlpPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
}
return offset;
}
@ -2535,11 +2536,11 @@ void proto_register_ulp(void) {
"ulp.SLPAddress", HFILL }},
{ &hf_ulp_ipv4Address,
{ "ipv4Address", "ulp.ipv4Address",
FT_BYTES, BASE_HEX, NULL, 0,
FT_IPv6, BASE_NONE, NULL, 0,
"ulp.OCTET_STRING_SIZE_4", HFILL }},
{ &hf_ulp_ipv6Address,
{ "ipv6Address", "ulp.ipv6Address",
FT_BYTES, BASE_HEX, NULL, 0,
FT_IPv6, BASE_NONE, NULL, 0,
"ulp.OCTET_STRING_SIZE_16", HFILL }},
{ &hf_ulp_fQDN,
{ "fQDN", "ulp.fQDN",