From d4c41103d91d4f1038aa0e4276f46467101f2d6a Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 16 Aug 2016 16:14:47 -0500 Subject: [PATCH] wscutil: Add extractor for UUID_R --- src/wscutil.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/wscutil.c b/src/wscutil.c index ecd67bbf..c4e2ce26 100644 --- a/src/wscutil.c +++ b/src/wscutil.c @@ -168,6 +168,15 @@ static bool extract_bool(struct wsc_attr_iter *iter, void *data) return true; } +static bool extract_uuid(struct wsc_attr_iter *iter, void *data) +{ + if (wsc_attr_iter_get_length(iter) != 16) + return false; + + memcpy(data, wsc_attr_iter_get_data(iter), 16); + return true; +} + static bool extract_ascii_string(struct wsc_attr_iter *iter, void *data, unsigned int max_len) { @@ -442,15 +451,6 @@ static bool extract_version(struct wsc_attr_iter *iter, void *data) return true; } -static bool extract_uuid(struct wsc_attr_iter *iter, void *data) -{ - if (wsc_attr_iter_get_length(iter) != 16) - return false; - - memcpy(data, wsc_attr_iter_get_data(iter), 16); - return true; -} - static bool extract_wsc_state(struct wsc_attr_iter *iter, void *data) { uint8_t *out = data; @@ -527,6 +527,8 @@ static attr_handler handler_for_type(enum wsc_attr type) return extract_wsc_state; case WSC_ATTR_UUID_E: return extract_uuid; + case WSC_ATTR_UUID_R: + return extract_uuid; default: break; }