#ifndef CA_COMMON_H_
#define CA_COMMON_H_
+#include "iotivity_config.h"
+
#ifndef WITH_ARDUINO
#ifdef TCP_ADAPTER
#define HAVE_SYS_POLL_H
#endif
/**
- * IP address Length
+ * IP address Length.
*/
#define CA_IPADDR_SIZE 16
#define CA_RAJABBERID_SIZE 256
/**
- * Mac address length for BT port
+ * Mac address length for BT port.
*/
#define CA_MACADDR_SIZE 18
/**
- * Max header options data length
+ * Max header options data length.
*/
#define CA_MAX_HEADER_OPTION_DATA_LENGTH 20
/**
-* Max token length
+* Max token length.
*/
#define CA_MAX_TOKEN_LEN (8)
/**
- * Max URI length
+ * Max URI length.
*/
#ifdef ARDUINO
#define CA_MAX_URI_LENGTH 128 /* maximum size of URI for embedded platforms*/
#endif
/**
- * Max PDU length supported
+ * Max PDU length supported.
*/
#ifdef ARDUINO
#define COAP_MAX_PDU_SIZE 320 /* maximum size of a CoAP PDU for embedded platforms*/
#endif
/**
- *Maximum length of the remoteEndpoint identity
+ *Maximum length of the remoteEndpoint identity.
*/
#define CA_MAX_ENDPOINT_IDENTITY_LEN (32)
/**
- * option types - the highest option number 63
+ * option types - the highest option number 63.
*/
#define CA_OPTION_IF_MATCH 1
#define CA_OPTION_ETAG 4
#define CA_OPTION_LOCATION_QUERY 20
/**
- * Payload information from resource model
+ * Payload information from resource model.
*/
typedef uint8_t *CAPayload_t;
typedef char *CAURI_t;
/**
- * Token information for mapping the request and responses by resource model
+ * Token information for mapping the request and responses by resource model.
*/
typedef char *CAToken_t;
-/**
- * Socket types and error definitions
+/*
+ * Socket types and error definitions.
*/
#ifdef HAVE_WINSOCK2_H
# define OC_SOCKET_ERROR SOCKET_ERROR
# define OC_INVALID_SOCKET INVALID_SOCKET
-typedef HANDLE CASocketFd_t;
+typedef SOCKET CASocketFd_t;
#else // HAVE_WINSOCK2_H
# define OC_SOCKET_ERROR (-1)
# define OC_INVALID_SOCKET (-1)
typedef int CASocketFd_t;
#endif
-/** The following flags are the same as the equivalent OIC values in
+/*
+ * The following flags are the same as the equivalent OIC values in
* octypes.h, allowing direct copying with slight fixup.
* The CA layer should used the OC types when build allows that.
*/
#ifdef RA_ADAPTER
#define MAX_ADDR_STR_SIZE_CA (256)
#else
-/** Max Address could be "coap+tcp://[xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:yyy.yyy.yyy.yyy]:xxxxx"
- * Which is 64, +1 for null terminator => 65
+/*
+ * Max Address could be "coaps+tcp://[xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:yyy.yyy.yyy.yyy]:xxxxx"
+ * Which is 65, +1 for null terminator => 66
* OCDevAddr (defined in OCTypes.h) must be the same
* as CAEndpoint_t (defined here)
*/
-#define MAX_ADDR_STR_SIZE_CA (65)
+#define MAX_ADDR_STR_SIZE_CA (66)
#endif
typedef enum
#define CA_SCOPE_MASK 0xf // mask scope bits above
/**
- * @enum CANetworkStatus_t
* Information about the network status.
*/
typedef enum
} CANetworkStatus_t;
/*
- * remoteEndpoint identity
+ * remoteEndpoint identity.
*/
typedef struct
{
} CARemoteId_t;
/**
- * @enum CAMessageType_t
- * Message Type for Base source code
+ * Message Type for Base source code.
*/
typedef enum
{
} CAMessageType_t;
/**
- * @enum CAMethod_t
- * Allowed method to be used by resource model
+ * Allowed method to be used by resource model.
*/
typedef enum
{
} CAMethod_t;
/**
- * block size
+ * block size.
* it depends on defined size in libCoAP.
*/
typedef enum
} CABlockSize_t;
/**
- * Endpoint information for connectivities
+ * Endpoint information for connectivities.
* Must be identical to OCDevAddr.
*/
typedef struct
} CAEndpoint_t;
/**
- * Endpoint information for secure messages
+ * Endpoint information for secure messages.
*/
typedef struct
{
CAEndpoint_t endpoint; /**< endpoint */
- CARemoteId_t identity; /**< endpoint identity */
+ // TODO change name to deviceId
+ CARemoteId_t identity; /**< endpoint device uuid */
+ CARemoteId_t userId; /**< endpoint user uuid */
} CASecureEndpoint_t;
/**
- * @enum CAResult_t
- * Enums for CA return values
+ * Enums for CA return values.
*/
typedef enum
{
} CAResult_t;
/**
- * @enum CAResponseResult_t
- * Enums for CA Response values
+ * Enums for CA Response values.
*/
typedef enum
{
} CAResponseResult_t;
/**
- * @enum CATransportProtocolID_t
- * Transport Protocol IDs for additional options
+ * Data type whether the data is Request Message or Response Message.
+ * if there is some failure before send data on network.
+ * Type will be set as error type for error callback.
+ */
+typedef enum
+{
+ CA_REQUEST_DATA = 1,
+ CA_RESPONSE_DATA,
+ CA_ERROR_DATA,
+ CA_RESPONSE_FOR_RES
+} CADataType_t;
+
+/**
+ * Transport Protocol IDs for additional options.
*/
typedef enum
{
} CATransportProtocolID_t;
/**
- * @enum CAAdapterState_t
* Adapter State to indicate the network changed notifications.
*/
typedef enum
} CAPayloadFormat_t;
/**
- * Header options structure to be filled
+ * Header options structure to be filled.
*
* This structure is used to hold header information.
*/
} CAHeaderOption_t;
/**
- * Base Information received
+ * Base Information received.
*
- * This structure is used to hold request & response base information
+ * This structure is used to hold request & response base information.
*/
typedef struct
{
CAPayloadFormat_t acceptFormat; /**< accept format for the response payload */
CAURI_t resourceUri; /**< Resource URI information **/
CARemoteId_t identity; /**< endpoint identity */
+ CADataType_t dataType; /**< data type */
} CAInfo_t;
/**
- * Request Information to be sent
+ * Request Information to be sent.
*
- * This structure is used to hold request information
+ * This structure is used to hold request information.
*/
typedef struct
{
} CARequestInfo_t;
/**
- * Response information received
+ * Response information received.
*
- * This structure is used to hold response information
+ * This structure is used to hold response information.
*/
typedef struct
{
/**
* Error information from CA
- * contains error code and message information
+ * contains error code and message information.
*
- * This structure holds error information
+ * This structure holds error information.
*/
typedef struct
{
} CAErrorInfo_t;
/**
- * Hold global variables for CA layer (also used by RI layer)
+ * Hold global variables for CA layer. (also used by RI layer)
*/
typedef struct
{
} CAHistory_t;
/**
- * Hold interface index for keeping track of comings and goings
+ * Hold interface index for keeping track of comings and goings.
*/
typedef struct
{