Revert "[CONPRO-1568] Ignoring duplicate IPv6/Ipv4 messages"

[platform/upstream/iotivity.git] / resource / csdk / connectivity / api / cacommon.h

diff --git a/resource/csdk/connectivity/api/cacommon.h b/resource/csdk/connectivity/api/cacommon.h
index 19bbc82..d1e53f7 100755 (executable)
--- a/resource/csdk/connectivity/api/cacommon.h
+++ b/resource/csdk/connectivity/api/cacommon.h
@@ -27,6 +27,9 @@
 #define CA_COMMON_H_
 
 #include "iotivity_config.h"
+#ifdef WITH_PROCESS_EVENT
+#include "ocevent.h"
+#endif
 
 #ifndef WITH_ARDUINO
 #ifdef TCP_ADAPTER
@@ -95,6 +98,11 @@ extern "C"
 #define CA_MAX_TOKEN_LEN (8)
 
 /**
+* Max interface name length.
+*/
+#define CA_MAX_INTERFACE_NAME_LEN (16)
+
+/**
  * Max URI length.
  */
 #ifdef ARDUINO
@@ -395,7 +403,9 @@ typedef enum
     CA_RESPONSE_DATA,
     CA_ERROR_DATA,
     CA_RESPONSE_FOR_RES,
-    CA_NETWORK_COMMAND
+    CA_NETWORK_COMMAND,
+    CA_REQUEST_DATA_SERVER_INIT,
+    CA_RESPONSE_DATA_CLIENT_INIT
 } CADataType_t;
 
 typedef enum
@@ -606,7 +616,6 @@ typedef struct
 #endif
 #endif
         int selectTimeout;          /**< in seconds */
-        int maxfd;                  /**< highest fd (for select) */
         bool started;               /**< the IP adapter has started */
         bool terminate;             /**< the IP adapter needs to stop */
         bool ipv6enabled;           /**< IPv6 enabled by OCInit flags */
@@ -647,9 +656,9 @@ typedef struct
         int shutdownFds[2];     /**< shutdown pipe */
 #endif
         int connectionFds[2];   /**< connection pipe */
-        int maxfd;              /**< highest fd (for select) */
         bool started;           /**< the TCP adapter has started */
         bool terminate;         /**< the TCP adapter needs to stop */
+        bool bindenabled;       /**< binding of TCP socket enabled */
         bool ipv4tcpenabled;    /**< IPv4 TCP enabled by OCInit flags */
         bool ipv6tcpenabled;    /**< IPv6 TCP enabled by OCInit flags */
     } tcp;
@@ -701,9 +710,9 @@ typedef void (*CANetworkMonitorCallback)(const CAEndpoint_t *info, CANetworkStat
  * Callback function type for editing bluetooth advertisement data before starting bluetooth advertisement.
  * param[in]   max_data_size    Maximal size of advertisement data array
  * param[out]  data             Advertisement data array
- * param[out]  real_data_size   Real size of advertisement data array
+ * param[out]  data_size        Actual Data size of advertisement data array
  */
-typedef void (*CAAdvertisementDataGetterCB)(int max_data_size, char *data, int *real_data_size);
+typedef void (*CAAdvertisementDataGetterCB)(int max_data_size, char *data, int *data_size);
 
 #ifdef __cplusplus
 } /* extern "C" */