diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-06-20 21:56:03 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-06-20 21:56:03 +0000 |
| commit | a80b9c8e410ff358a04ee847c213a9a164af47b4 (patch) | |
| tree | 6690a99b44d0a14b9c17ee450f1031087961190d | |
| parent | 607b0b1048020344ffc46328ff2f4e0b80d70849 (diff) | |
| download | wireshark-a80b9c8e410ff358a04ee847c213a9a164af47b4.tar.gz | |
Show IPv4/IPv6 addresses as such.
svn path=/trunk/; revision=22147
| -rw-r--r-- | asn1/ulp/ulp.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-ulp.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf index cc3f8fbbe6..1cbf56cdf9 100644 --- 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 464c5b336d..de7fd94dc7 100644 --- 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", |