Show IPv4/IPv6 addresses as such.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22147 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf
index cc3f8fbbe66385ac3fe2ed404024ce7c0f992818..1cbf56cdf90f31927c25657a58e008d7e8cb2028 100644 (file)
--- a/asn1/ulp/ulp.cnf
+++ b/asn1/ulp/ulp.cnf
@@ -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

diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index 464c5b336da236ef9c1b5830add7b48aa291743f..de7fd94dc772078aac26381bad225c71c27c44f6 100644 (file)
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -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",