Diff: iothubtransport_amqp_device.h

Revision:

34:51d158b409d2

Parent:

30:20a85b733111

Child:

39:e98d5df6dc74

--- a/iothubtransport_amqp_device.h	Fri Apr 21 14:49:45 2017 -0700
+++ b/iothubtransport_amqp_device.h	Mon May 08 10:49:54 2017 -0700
@@ -26,49 +26,49 @@
 
 typedef enum DEVICE_STATE_TAG
 {
-	DEVICE_STATE_STOPPED,
-	DEVICE_STATE_STOPPING,
-	DEVICE_STATE_STARTING,
-	DEVICE_STATE_STARTED,
-	DEVICE_STATE_ERROR_AUTH,
-	DEVICE_STATE_ERROR_AUTH_TIMEOUT,
-	DEVICE_STATE_ERROR_MSG
+    DEVICE_STATE_STOPPED,
+    DEVICE_STATE_STOPPING,
+    DEVICE_STATE_STARTING,
+    DEVICE_STATE_STARTED,
+    DEVICE_STATE_ERROR_AUTH,
+    DEVICE_STATE_ERROR_AUTH_TIMEOUT,
+    DEVICE_STATE_ERROR_MSG
 } DEVICE_STATE;
 
 typedef enum DEVICE_AUTH_MODE_TAG
 {
-	DEVICE_AUTH_MODE_CBS,
-	DEVICE_AUTH_MODE_X509
+    DEVICE_AUTH_MODE_CBS,
+    DEVICE_AUTH_MODE_X509
 } DEVICE_AUTH_MODE;
 
 typedef enum DEVICE_SEND_STATUS_TAG
 {
-	DEVICE_SEND_STATUS_IDLE,
-	DEVICE_SEND_STATUS_BUSY
+    DEVICE_SEND_STATUS_IDLE,
+    DEVICE_SEND_STATUS_BUSY
 } DEVICE_SEND_STATUS;
 
 typedef enum D2C_EVENT_SEND_RESULT_TAG
 {
-	D2C_EVENT_SEND_COMPLETE_RESULT_OK,
-	D2C_EVENT_SEND_COMPLETE_RESULT_ERROR_CANNOT_PARSE,
-	D2C_EVENT_SEND_COMPLETE_RESULT_ERROR_FAIL_SENDING,
-	D2C_EVENT_SEND_COMPLETE_RESULT_ERROR_TIMEOUT,
-	D2C_EVENT_SEND_COMPLETE_RESULT_DEVICE_DESTROYED,
-	D2C_EVENT_SEND_COMPLETE_RESULT_ERROR_UNKNOWN
+    D2C_EVENT_SEND_COMPLETE_RESULT_OK,
+    D2C_EVENT_SEND_COMPLETE_RESULT_ERROR_CANNOT_PARSE,
+    D2C_EVENT_SEND_COMPLETE_RESULT_ERROR_FAIL_SENDING,
+    D2C_EVENT_SEND_COMPLETE_RESULT_ERROR_TIMEOUT,
+    D2C_EVENT_SEND_COMPLETE_RESULT_DEVICE_DESTROYED,
+    D2C_EVENT_SEND_COMPLETE_RESULT_ERROR_UNKNOWN
 } D2C_EVENT_SEND_RESULT;
 
 typedef enum DEVICE_MESSAGE_DISPOSITION_RESULT_TAG
 {
-	DEVICE_MESSAGE_DISPOSITION_RESULT_NONE,
-	DEVICE_MESSAGE_DISPOSITION_RESULT_ACCEPTED,
-	DEVICE_MESSAGE_DISPOSITION_RESULT_REJECTED,
-	DEVICE_MESSAGE_DISPOSITION_RESULT_RELEASED
+    DEVICE_MESSAGE_DISPOSITION_RESULT_NONE,
+    DEVICE_MESSAGE_DISPOSITION_RESULT_ACCEPTED,
+    DEVICE_MESSAGE_DISPOSITION_RESULT_REJECTED,
+    DEVICE_MESSAGE_DISPOSITION_RESULT_RELEASED
 } DEVICE_MESSAGE_DISPOSITION_RESULT;
 
 typedef struct DEVICE_MESSAGE_DISPOSITION_INFO_TAG
 {
-	unsigned long message_id;
-	char* source;
+    unsigned long message_id;
+    char* source;
 } DEVICE_MESSAGE_DISPOSITION_INFO;
 
 typedef void(*ON_DEVICE_STATE_CHANGED)(void* context, DEVICE_STATE previous_state, DEVICE_STATE new_state);
@@ -77,15 +77,16 @@
 
 typedef struct DEVICE_CONFIG_TAG
 {
-	char* device_id;
-	char* iothub_host_fqdn;
-	DEVICE_AUTH_MODE authentication_mode;
-	ON_DEVICE_STATE_CHANGED on_state_changed_callback;
-	void* on_state_changed_context;
+    const char* device_id;
+    char* product_info;
+    char* iothub_host_fqdn;
+    DEVICE_AUTH_MODE authentication_mode;
+    ON_DEVICE_STATE_CHANGED on_state_changed_callback;
+    void* on_state_changed_context;
 
-	char* device_primary_key;
-	char* device_secondary_key;
-	char* device_sas_token;
+    // Auth module used to generating handle authorization
+    // with either SAS Token, x509 Certs, and Device SAS Token
+    IOTHUB_AUTHORIZATION_HANDLE authorization_module;
 } DEVICE_CONFIG;
 
 typedef struct DEVICE_INSTANCE* DEVICE_HANDLE;