aboutsummaryrefslogtreecommitdiffstats
path: root/epan/osi-utils.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-02-12 12:03:49 -0500
committerMichael Mann <mmann78@netscape.net>2015-02-19 13:09:41 +0000
commit8d16ac46d50445f4e0ce567acb8e265db08a7576 (patch)
tree54d7b9813f8b83cca7d9592b2f5ae313f720a940 /epan/osi-utils.c
parent7208355fb99f18b5b82d028f6af170f3dbafc8c9 (diff)
Add name resolution support to address type.
Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/osi-utils.c')
-rw-r--r--epan/osi-utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index 95354c7d1b..073c43ba35 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -220,10 +220,10 @@ print_area_buf(const guint8 *ad, int length, gchar *buf, int buf_len)
******************************************************************************/
static int osi_address_type = -1;
-static gboolean osi_address_to_str(const address* addr, gchar *buf, int buf_len)
+static int osi_address_to_str(const address* addr, gchar *buf, int buf_len)
{
print_nsap_net_buf((const guint8 *)addr->data, addr->len, buf, buf_len);
- return TRUE;
+ return strlen(buf)+1;
}
static int osi_address_str_len(const address* addr _U_)
@@ -241,7 +241,7 @@ void register_osi_address_type(void)
if (osi_address_type != -1)
return;
- osi_address_type = address_type_dissector_register("AT_OSI", "OSI Address", osi_address_to_str, osi_address_str_len, NULL, NULL);
+ osi_address_type = address_type_dissector_register("AT_OSI", "OSI Address", osi_address_to_str, osi_address_str_len, NULL, NULL, NULL, NULL);
}