From 090ac0310052adf0c5a40e902d8de4a3779dd8cd Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Mon, 15 Jul 2019 11:33:12 -0700 Subject: [PATCH] ie: expose vendor OUIs In the same fashion as the WSC WFA OUI, ie.[ch] will now expose the other vendor OUIs to avoid duplication across multiple files in IWD as well as used in iwmon. --- src/anqp.c | 2 -- src/ie.c | 6 +++--- src/ie.h | 4 ++++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/anqp.c b/src/anqp.c index e89bd262..3eb6d2f4 100644 --- a/src/anqp.c +++ b/src/anqp.c @@ -52,8 +52,6 @@ struct anqp_request { static struct l_genl_family *nl80211 = NULL; -static const uint8_t wifi_alliance_oui[3] = { 0x50, 0x6f, 0x9a }; - static struct l_queue *anqp_requests; static uint8_t anqp_token = 0; diff --git a/src/ie.c b/src/ie.c index 69b31a84..5e607df4 100644 --- a/src/ie.c +++ b/src/ie.c @@ -32,9 +32,9 @@ #include "src/crypto.h" #include "src/ie.h" -static const uint8_t ieee_oui[3] = { 0x00, 0x0f, 0xac }; -static const uint8_t microsoft_oui[3] = { 0x00, 0x50, 0xf2 }; -static const uint8_t wifi_alliance_oui[3] = { 0x50, 0x6f, 0x9a }; +const unsigned char ieee_oui[3] = { 0x00, 0x0f, 0xac }; +const unsigned char microsoft_oui[3] = { 0x00, 0x50, 0xf2 }; +const unsigned char wifi_alliance_oui[3] = { 0x50, 0x6f, 0x9a }; void ie_tlv_iter_init(struct ie_tlv_iter *iter, const unsigned char *tlv, unsigned int len) diff --git a/src/ie.h b/src/ie.h index 9fb7715d..61190326 100644 --- a/src/ie.h +++ b/src/ie.h @@ -395,6 +395,10 @@ struct ie_neighbor_report_info { bool bss_transition_pref_present : 1; }; +extern const unsigned char ieee_oui[3]; +extern const unsigned char microsoft_oui[3]; +extern const unsigned char wifi_alliance_oui[3]; + void ie_tlv_iter_init(struct ie_tlv_iter *iter, const unsigned char *tlv, unsigned int len); void ie_tlv_iter_recurse(struct ie_tlv_iter *iter,