#include <mswsock.h>
#endif
-#include "ocrandom.h"
-
#ifdef __cplusplus
extern "C"
{
/**
*Maximum length of the remoteEndpoint identity.
*/
-#define CA_MAX_ENDPOINT_IDENTITY_LEN UUID_STRING_SIZE
+#define CA_MAX_ENDPOINT_IDENTITY_LEN CA_MAX_IDENTITY_SIZE
+
+/**
+ * Max identity size.
+ */
+#define CA_MAX_IDENTITY_SIZE (37)
/**
* option types - the highest option number 63.
uint16_t port; // for IP
char addr[MAX_ADDR_STR_SIZE_CA]; // address for all
uint32_t ifindex; // usually zero for default interface
- char deviceId[UUID_STRING_SIZE]; // device ID of remote device
+ char deviceId[CA_MAX_IDENTITY_SIZE]; // device ID of remote device
#if defined (ROUTING_GATEWAY) || defined (ROUTING_EP)
char routeData[MAX_ADDR_STR_SIZE_CA]; /**< GatewayId:ClientId of
destination. **/
#define WITH_PRESENCE
#include "ocpresence.h"
-#include "ocrandom.h"
+
//-----------------------------------------------------------------------------
// Defines
//-----------------------------------------------------------------------------
/** Blocks of MAC address */
#define MAC_ADDR_BLOCKS (6)
+/** Max identity size. */
+#define MAX_IDENTITY_SIZE (37)
+
/** Universal unique identity size. */
#define UUID_IDENTITY_SIZE (128/8)
uint16_t id_length;
/** Array of end point identity.*/
- unsigned char id[UUID_STRING_SIZE];
+ unsigned char id[MAX_IDENTITY_SIZE];
} OCIdentity;
/**
char routeData[MAX_ADDR_STR_SIZE];
/** destination DeviceID.*/
- char deviceId[UUID_STRING_SIZE];
+ char deviceId[MAX_IDENTITY_SIZE];
} OCDevAddr;
$(LOCAL_PATH)/../../../../../../../../../resource/c_common \
$(LOCAL_PATH)/../../../../../../../../../resource/oc_logger/include \
$(LOCAL_PATH)/../../../../../../../../../resource/c_common/oic_malloc/include \
- $(LOCAL_PATH)/../../../../../../../../../resource/c_common/ocrandom/include \
$(LOCAL_PATH)/../../../../../../../../../resource/csdk/connectivity/api \
$(LOCAL_PATH)/../../../../../../../../../resource/csdk/stack/include \
$(LOCAL_PATH)/../../../../../../../../../resource/csdk/logger/include \
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
-LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/ocrandom/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/oic_string/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/oc_logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
-LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/ocrandom/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/oic_string/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/oc_logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/oc_logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
-LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/ocrandom/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/
LOCAL_C_INCLUDES := $(LOCAL_PATH)/util
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
-LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/ocrandom/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/stack/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/resource-encapsulation/include
%endif
cp resource/c_common/*.h %{buildroot}%{_includedir}
-cp resource/c_common/ocrandom/include/*.h %{buildroot}%{_includedir}
cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}
cp resource/csdk/logger/include/*.h %{buildroot}%{_includedir}