Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 23:09:34 +01:00
Code Releases Activity

wscutil: Expose WSC WFA OUI

Browse Source
This commit is contained in:
Denis Kenzior 2016-08-24 21:35:41 -05:00
parent 0a314004ce
commit 887119c82f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wscutil.c
View File

@ -32,7 +32,7 @@
#include "wscutil.h" #include "wscutil.h"
static const unsigned char wfa_ext[3] = { 0x00, 0x37, 0x2a }; const unsigned char wsc_wfa_oui[3] = { 0x00, 0x37, 0x2a };
void wsc_wfa_ext_iter_init(struct wsc_wfa_ext_iter *iter, void wsc_wfa_ext_iter_init(struct wsc_wfa_ext_iter *iter,
const unsigned char *pdu, unsigned short len) const unsigned char *pdu, unsigned short len)
@ -116,7 +116,7 @@ bool wsc_attr_iter_recurse_wfa_ext(struct wsc_attr_iter *iter,
if (iter->len < 3) if (iter->len < 3)
return false; return false;
if (memcmp(iter->data, wfa_ext, sizeof(wfa_ext))) if (memcmp(iter->data, wsc_wfa_oui, sizeof(wsc_wfa_oui)))
return false; return false;
wsc_wfa_ext_iter_init(wfa_iter, iter->data + 3, iter->len - 3); wsc_wfa_ext_iter_init(wfa_iter, iter->data + 3, iter->len - 3);
@ -1510,7 +1510,7 @@ static void build_wsc_state(struct wsc_attr_builder *builder,
#define START_WFA_VENDOR_EXTENSION() \ #define START_WFA_VENDOR_EXTENSION() \
wsc_attr_builder_start_attr(builder, WSC_ATTR_VENDOR_EXTENSION);\ wsc_attr_builder_start_attr(builder, WSC_ATTR_VENDOR_EXTENSION);\
wsc_attr_builder_put_oui(builder, wfa_ext); \ wsc_attr_builder_put_oui(builder, wsc_wfa_oui); \
wsc_attr_builder_put_u8(builder, WSC_WFA_EXTENSION_VERSION2); \ wsc_attr_builder_put_u8(builder, WSC_WFA_EXTENSION_VERSION2); \
wsc_attr_builder_put_u8(builder, 1); \ wsc_attr_builder_put_u8(builder, 1); \
wsc_attr_builder_put_u8(builder, 0x20) wsc_attr_builder_put_u8(builder, 0x20)

2
src/wscutil.h
View File

@ -260,6 +260,8 @@ enum wsc_state {
WSC_STATE_CONFIGURED = 0x02, WSC_STATE_CONFIGURED = 0x02,
}; };
extern const unsigned char wsc_wfa_oui[3];
struct wsc_wfa_ext_iter { struct wsc_wfa_ext_iter {
unsigned short max; unsigned short max;
unsigned short pos; unsigned short pos;