From 2133a5edb389e4224a04ef41318708e67ab4cf54 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 16 Aug 2016 12:29:30 -0500 Subject: [PATCH] wscutil: Rename WSC_CONFIG_STATE to WSC_STATE --- src/wscutil.c | 6 +++--- src/wscutil.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/wscutil.c b/src/wscutil.c index 9445c69e..3d4e536a 100644 --- a/src/wscutil.c +++ b/src/wscutil.c @@ -758,7 +758,7 @@ int wsc_parse_beacon(const unsigned char *pdu, unsigned int len, r = wsc_parse_attrs(pdu, len, &out->version2, &iter, REQUIRED(VERSION, &version), - REQUIRED(WSC_STATE, &out->config_state), + REQUIRED(WSC_STATE, &out->state), OPTIONAL(AP_SETUP_LOCKED, &out->ap_setup_locked), OPTIONAL(SELECTED_REGISTRAR, &out->selected_registrar), REGISTRAR(DEVICE_PASSWORD_ID, &out->device_password_id), @@ -810,7 +810,7 @@ int wsc_parse_probe_response(const unsigned char *pdu, unsigned int len, r = wsc_parse_attrs(pdu, len, &out->version2, &iter, REQUIRED(VERSION, &version), - REQUIRED(WSC_STATE, &out->config_state), + REQUIRED(WSC_STATE, &out->state), OPTIONAL(AP_SETUP_LOCKED, &out->ap_setup_locked), OPTIONAL(SELECTED_REGISTRAR, &out->selected_registrar), REGISTRAR(DEVICE_PASSWORD_ID, &out->device_password_id), @@ -926,7 +926,7 @@ int wsc_parse_m1(const uint8_t *pdu, uint32_t len, struct wsc_m1 *out) REQUIRED(ENCRYPTION_TYPE_FLAGS, &out->encryption_type_flags), REQUIRED(CONNECTION_TYPE_FLAGS, &out->connection_type_flags), REQUIRED(CONFIGURATION_METHODS, &out->config_methods), - REQUIRED(WSC_STATE, &out->config_state), + REQUIRED(WSC_STATE, &out->state), REQUIRED(MANUFACTURER, &out->manufacturer), REQUIRED(MODEL_NAME, &out->model_name), REQUIRED(MODEL_NUMBER, &out->model_number), diff --git a/src/wscutil.h b/src/wscutil.h index fa4efc23..93f9c93b 100644 --- a/src/wscutil.h +++ b/src/wscutil.h @@ -253,9 +253,9 @@ enum wsc_rf_band { }; /* Table 45 */ -enum wsc_config_state { - WSC_CONFIG_STATE_NOT_CONFIGURED = 0x01, - WSC_CONFIG_STATE_CONFIGURED = 0x02, +enum wsc_state { + WSC_STATE_NOT_CONFIGURED = 0x01, + WSC_STATE_CONFIGURED = 0x02, }; struct wsc_wfa_ext_iter { @@ -329,7 +329,7 @@ struct wsc_primary_device_type { struct wsc_beacon { bool version2; - enum wsc_config_state config_state; + enum wsc_state state; bool ap_setup_locked; bool selected_registrar; enum wsc_device_password_id device_password_id; @@ -342,7 +342,7 @@ struct wsc_beacon { struct wsc_probe_response { bool version2; - enum wsc_config_state config_state; + enum wsc_state state; bool ap_setup_locked; bool selected_registrar; enum wsc_device_password_id device_password_id; @@ -390,7 +390,7 @@ struct wsc_m1 { uint16_t encryption_type_flags; uint8_t connection_type_flags; uint16_t config_methods; - enum wsc_config_state config_state; + enum wsc_state state; char manufacturer[65]; char model_name[33]; char model_number[33];