diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-12 12:03:49 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-02-19 13:09:41 +0000 |
| commit | 8d16ac46d50445f4e0ce567acb8e265db08a7576 (patch) | |
| tree | 54d7b9813f8b83cca7d9592b2f5ae313f720a940 /epan/dissectors/packet-mstp.c | |
| parent | 7208355fb99f18b5b82d028f6af170f3dbafc8c9 (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/dissectors/packet-mstp.c')
| -rw-r--r-- | epan/dissectors/packet-mstp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index c8159c99aa..f0c2b9f4dd 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -149,19 +149,19 @@ mstp_frame_type_text(guint32 val) "Unknown Frame Type (%u)"); } -static gboolean mstp_to_str(const address* addr, gchar *buf, int buf_len _U_) +static int mstp_str_len(const address* addr _U_) +{ + return 5; +} + +static int mstp_to_str(const address* addr, gchar *buf, int buf_len _U_) { *buf++ = '0'; *buf++ = 'x'; buf = bytes_to_hexstr(buf, (const guint8 *)addr->data, 1); *buf = '\0'; /* NULL terminate */ - return TRUE; -} - -static int mstp_str_len(const address* addr _U_) -{ - return 5; + return mstp_str_len(addr); } static const char* mstp_col_filter_str(const address* addr _U_, gboolean is_src) @@ -465,7 +465,7 @@ proto_register_mstp(void) "MSTP Vendor specific Frametypes", FT_UINT24, BASE_DEC); /* Table_type: (Vendor ID << 16) + Frametype */ - mstp_address_type = address_type_dissector_register("AT_MSTP", "BACnet MS/TP Address", mstp_to_str, mstp_str_len, mstp_col_filter_str, mstp_len); + mstp_address_type = address_type_dissector_register("AT_MSTP", "BACnet MS/TP Address", mstp_to_str, mstp_str_len, mstp_col_filter_str, mstp_len, NULL, NULL); } void |