replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / easy-setup / enrollee / inc / ESEnrolleeCommon.h

diff --git a/service/easy-setup/enrollee/inc/ESEnrolleeCommon.h b/service/easy-setup/enrollee/inc/ESEnrolleeCommon.h
index 41f1902..91811a5 100755 (executable)
--- a/service/easy-setup/enrollee/inc/ESEnrolleeCommon.h
+++ b/service/easy-setup/enrollee/inc/ESEnrolleeCommon.h
@@ -30,27 +30,34 @@ extern "C"
 #endif
 
 /**
+ * @brief Data structure for connect request from Mediator
+ */
+typedef struct
+{
+    ES_CONNECT_TYPE connect[NUM_CONNECT_TYPE];
+    int numRequest;
+} ESConnectRequest;
+
+/**
  * @brief Data structure delivered from mediator, which provides WiFi information
  */
 typedef struct
 {
-    char ssid[OIC_STRING_MAX_VALUE];         /**< Ssid of the Enroller**/
-    char pwd[OIC_STRING_MAX_VALUE];          /**< Pwd of the Enroller**/
-    WIFI_AUTHTYPE authtype;         /**< Auth type of the Enroller**/
-    WIFI_ENCTYPE enctype;           /**< Encryption type of the Enroller**/
-    void *userdata;                 /**< Vender-specific data**/
-} ESWiFiProvData;
+    char ssid[OIC_STRING_MAX_VALUE];        /**< Ssid of the Enroller**/
+    char pwd[OIC_STRING_MAX_VALUE];         /**< Pwd of the Enroller**/
+    WIFI_AUTHTYPE authtype;                 /**< Auth type of the Enroller**/
+    WIFI_ENCTYPE enctype;                   /**< Encryption type of the Enroller**/
+    void *userdata;                         /**< Vender-specific data**/
+} ESWiFiConfData;
 
 /**
  * @brief Data structure delivered from mediator, which provides device configuration information
  */
 typedef struct
 {
-    char location[OIC_STRING_MAX_VALUE];    /**< GPS information of device. Longitude and latitude in json format **/
-    char language[OIC_STRING_MAX_VALUE];    /**< IETF language tag using ISO 639X **/
-    char country[OIC_STRING_MAX_VALUE];     /**< ISO Country Code (ISO 3166-1 Alpha-2) **/
+    // TODO: variables can be added when some properties in oic.r.devconf resource are specified.
     void *userdata;                         /**< Vender-specific data**/
-} ESDevConfProvData;
+} ESDevConfData;
 
 /**
  * @brief Data structure delivered from mediator, which provides Cloud server information
@@ -58,10 +65,12 @@ typedef struct
 typedef struct
 {
     char authCode[OIC_STRING_MAX_VALUE];        /**< Auth code issued by OAuth2.0-compatible account server **/
+    char accessToken[OIC_STRING_MAX_VALUE];     /**< Access token resolved with an auth code **/
+    OAUTH_TOKENTYPE accessTokenType;            /**< Access token type **/
     char authProvider[OIC_STRING_MAX_VALUE];    /**< Auth provider ID **/
     char ciServer[OIC_STRING_MAX_VALUE];        /**< Cloud interface server URL which an Enrollee is going to registered **/
     void *userdata;                             /**< Vender-specific data**/
-} ESCloudProvData;
+} ESCoapCloudConfData;
 
 /**
  * @brief Data structure stored for Device property which includes a WiFi and device configuration.
@@ -83,7 +92,6 @@ typedef struct
     struct
     {
         char deviceName[OIC_STRING_MAX_VALUE];
-        char modelNumber[OIC_STRING_MAX_VALUE];
     } DevConf;
 } ESDeviceProperty;
 
@@ -93,9 +101,10 @@ typedef struct
  */
 typedef struct
 {
-    void (*WiFiProvCb) (ESWiFiProvData *);
-    void (*DevConfProvCb) (ESDevConfProvData *);
-    void (*CloudDataProvCb) (ESCloudProvData *);
+    void (*ConnectRequestCb) (ESConnectRequest *);
+    void (*WiFiConfProvCb) (ESWiFiConfData *);
+    void (*DevConfProvCb) (ESDevConfData *);
+    void (*CoapCloudConfProvCb) (ESCoapCloudConfData *);
 } ESProvisioningCallbacks;