Add OC_API annotations to oc_buffer_settings.h

api/cloud/oc_cloud.c

@@ -35,12 +35,15 @@
 #include "oc_api.h"
 #include "oc_collection.h"
 #include "oc_core_res.h"
-#include "oc_network_monitor.h"
 #include "port/oc_assert.h"
 #include "util/oc_endpoint_address_internal.h"
 #include "util/oc_mmem_internal.h"
 #include "util/oc_secure_string_internal.h"
 
+#ifdef OC_NETWORK_MONITOR
+#include "oc_network_monitor.h"
+#endif /* OC_NETWORK_MONITOR */
+
 #ifdef OC_SECURITY
 #include "security/oc_tls_internal.h"
 #endif /* OC_SECURITY */

api/oc_buffer_settings.c

@@ -0,0 +1,172 @@
+/****************************************************************************
+ *
+ * Copyright (c) 2017 Intel Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"),
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ ****************************************************************************/
+
+#include "oc_buffer_settings.h"
+#include "port/oc_log_internal.h"
+#include "util/oc_features.h"
+
+#include <stddef.h>
+
+#ifdef OC_DYNAMIC_ALLOCATION
+
+#include "messaging/coap/conf.h"
+
+#ifdef OC_INOUT_BUFFER_SIZE
+static size_t _OC_MTU_SIZE = OC_INOUT_BUFFER_SIZE;
+#else  /* OC_INOUT_BUFFER_SIZE */
+static size_t _OC_MTU_SIZE = 2048 + COAP_MAX_HEADER_SIZE;
+#endif /* !OC_INOUT_BUFFER_SIZE */
+
+static size_t _OC_MAX_APP_DATA_SIZE = 7168;
+#if defined(OC_APP_DATA_BUFFER_SIZE) || !defined(OC_REP_ENCODING_REALLOC)
+static size_t _OC_MIN_APP_DATA_SIZE = 7168;
+#else  /* OC_APP_DATA_BUFFER_SIZE || !OC_REP_ENCODING_REALLOC */
+static size_t _OC_MIN_APP_DATA_SIZE = 256;
+#endif /* !OC_APP_DATA_BUFFER_SIZE && OC_REP_ENCODING_REALLOC */
+static size_t _OC_BLOCK_SIZE = 1024; // FIX
+
+int
+oc_set_mtu_size(size_t mtu_size)
+{
+  (void)mtu_size;
+#ifdef OC_INOUT_BUFFER_SIZE
+  return -1;
+#else /* !OC_INOUT_BUFFER_SIZE */
+#ifdef OC_BLOCK_WISE
+  if (mtu_size < (COAP_MAX_HEADER_SIZE + 16)) {
+    return -1;
+  }
+#ifdef OC_OSCORE
+  _OC_MTU_SIZE = mtu_size + COAP_MAX_HEADER_SIZE;
+#else  /* OC_OSCORE */
+  _OC_MTU_SIZE = mtu_size;
+#endif /* !OC_OSCORE */
+  mtu_size -= COAP_MAX_HEADER_SIZE;
+  size_t i;
+  for (i = 10; i >= 4 && (mtu_size >> i) == 0; i--)
+    ;
+  _OC_BLOCK_SIZE = ((size_t)1) << i;
+#endif /* OC_BLOCK_WISE */
+  return 0;
+#endif /* OC_INOUT_BUFFER_SIZE */
+}
+
+long
+oc_get_mtu_size(void)
+{
+  return (long)_OC_MTU_SIZE;
+}
+
+void
+oc_set_max_app_data_size(size_t size)
+{
+#ifdef OC_APP_DATA_BUFFER_SIZE
+  (void)size;
+#else /* !OC_APP_DATA_BUFFER_SIZE */
+  _OC_MAX_APP_DATA_SIZE = size;
+#ifndef OC_REP_ENCODING_REALLOC
+  _OC_MIN_APP_DATA_SIZE = size;
+#endif /* !OC_REP_ENCODING_REALLOC */
+#ifndef OC_BLOCK_WISE
+  _OC_BLOCK_SIZE = size;
+  _OC_MTU_SIZE = size + COAP_MAX_HEADER_SIZE;
+#endif /* !OC_BLOCK_WISE */
+#endif /* OC_APP_DATA_BUFFER_SIZE */
+}
+
+long
+oc_get_max_app_data_size(void)
+{
+  return (long)_OC_MAX_APP_DATA_SIZE;
+}
+
+void
+oc_set_min_app_data_size(size_t size)
+{
+#if defined(OC_APP_DATA_BUFFER_SIZE) || !defined(OC_REP_ENCODING_REALLOC)
+  (void)size;
+#else  /* !OC_APP_DATA_BUFFER_SIZE && !OC_REP_ENCODING_REALLOC */
+  _OC_MIN_APP_DATA_SIZE = size;
+#endif /* OC_APP_DATA_BUFFER_SIZE || !OC_REP_ENCODING_REALLOC */
+}
+
+long
+oc_get_min_app_data_size(void)
+{
+  return (long)_OC_MIN_APP_DATA_SIZE;
+}
+
+long
+oc_get_block_size(void)
+{
+  return (long)_OC_BLOCK_SIZE;
+}
+
+#else /* !OC_DYNAMIC_ALLOCATION  */
+
+int
+oc_set_mtu_size(size_t mtu_size)
+{
+  (void)mtu_size;
+  OC_WRN("Dynamic memory not available");
+  return -1;
+}
+
+long
+oc_get_mtu_size(void)
+{
+  OC_WRN("Dynamic memory not available");
+  return -1;
+}
+
+void
+oc_set_max_app_data_size(size_t size)
+{
+  (void)size;
+  OC_WRN("Dynamic memory not available");
+}
+
+long
+oc_get_max_app_data_size(void)
+{
+  OC_WRN("Dynamic memory not available");
+  return -1;
+}
+
+void
+oc_set_min_app_data_size(size_t size)
+{
+  (void)size;
+  OC_WRN("Dynamic memory not available");
+}
+
+long
+oc_get_min_app_data_size(void)
+{
+  OC_WRN("Dynamic memory not available");
+  return -1;
+}
+
+long
+oc_get_block_size(void)
+{
+  OC_WRN("Dynamic memory not available");
+  return -1;
+}
+
+#endif /* OC_DYNAMIC_ALLOCATION */

api/oc_main.c

@@ -98,154 +98,6 @@ oc_get_factory_presets_cb(void)
   return &g_factory_presets;
 }
 
-#ifdef OC_DYNAMIC_ALLOCATION
-#include "oc_buffer_settings.h"
-#ifdef OC_INOUT_BUFFER_SIZE
-static size_t _OC_MTU_SIZE = OC_INOUT_BUFFER_SIZE;
-#else  /* OC_INOUT_BUFFER_SIZE */
-static size_t _OC_MTU_SIZE = 2048 + COAP_MAX_HEADER_SIZE;
-#endif /* !OC_INOUT_BUFFER_SIZE */
-#ifdef OC_APP_DATA_BUFFER_SIZE
-static size_t _OC_MAX_APP_DATA_SIZE = 7168;
-static size_t _OC_MIN_APP_DATA_SIZE = 7168;
-#else /* OC_APP_DATA_BUFFER_SIZE */
-static size_t _OC_MAX_APP_DATA_SIZE = 7168;
-#ifdef OC_REP_ENCODING_REALLOC
-static size_t _OC_MIN_APP_DATA_SIZE = 256;
-#else                                /* OC_REP_ENCODING_REALLOC */
-static size_t _OC_MIN_APP_DATA_SIZE = 7168;
-#endif                               /* !OC_REP_ENCODING_REALLOC */
-#endif                               /* !OC_APP_DATA_BUFFER_SIZE */
-static size_t _OC_BLOCK_SIZE = 1024; // FIX
-
-int
-oc_set_mtu_size(size_t mtu_size)
-{
-  (void)mtu_size;
-#ifdef OC_INOUT_BUFFER_SIZE
-  return -1;
-#else /* !OC_INOUT_BUFFER_SIZE */
-#ifdef OC_BLOCK_WISE
-  if (mtu_size < (COAP_MAX_HEADER_SIZE + 16)) {
-    return -1;
-  }
-#ifdef OC_OSCORE
-  _OC_MTU_SIZE = mtu_size + COAP_MAX_HEADER_SIZE;
-#else  /* OC_OSCORE */
-  _OC_MTU_SIZE = mtu_size;
-#endif /* !OC_OSCORE */
-  mtu_size -= COAP_MAX_HEADER_SIZE;
-  size_t i;
-  for (i = 10; i >= 4 && (mtu_size >> i) == 0; i--)
-    ;
-  _OC_BLOCK_SIZE = ((size_t)1) << i;
-#endif /* OC_BLOCK_WISE */
-  return 0;
-#endif /* OC_INOUT_BUFFER_SIZE */
-}
-
-long
-oc_get_mtu_size(void)
-{
-  return (long)_OC_MTU_SIZE;
-}
-
-void
-oc_set_max_app_data_size(size_t size)
-{
-#ifdef OC_APP_DATA_BUFFER_SIZE
-  (void)size;
-#else /* !OC_APP_DATA_BUFFER_SIZE */
-  _OC_MAX_APP_DATA_SIZE = size;
-#ifndef OC_REP_ENCODING_REALLOC
-  _OC_MIN_APP_DATA_SIZE = size;
-#endif /* !OC_REP_ENCODING_REALLOC */
-#ifndef OC_BLOCK_WISE
-  _OC_BLOCK_SIZE = size;
-  _OC_MTU_SIZE = size + COAP_MAX_HEADER_SIZE;
-#endif /* !OC_BLOCK_WISE */
-#endif /* OC_APP_DATA_BUFFER_SIZE */
-}
-
-long
-oc_get_max_app_data_size(void)
-{
-  return (long)_OC_MAX_APP_DATA_SIZE;
-}
-
-void
-oc_set_min_app_data_size(size_t size)
-{
-#if defined(OC_APP_DATA_BUFFER_SIZE) || !defined(OC_REP_ENCODING_REALLOC)
-  (void)size;
-#else  /* !OC_APP_DATA_BUFFER_SIZE && !OC_REP_ENCODING_REALLOC */
-  _OC_MIN_APP_DATA_SIZE = size;
-#endif /* OC_APP_DATA_BUFFER_SIZE || !OC_REP_ENCODING_REALLOC */
-}
-
-long
-oc_get_min_app_data_size(void)
-{
-  return (long)_OC_MIN_APP_DATA_SIZE;
-}
-
-long
-oc_get_block_size(void)
-{
-  return (long)_OC_BLOCK_SIZE;
-}
-#else  /* !OC_DYNAMIC_ALLOCATION  */
-int
-oc_set_mtu_size(size_t mtu_size)
-{
-  (void)mtu_size;
-  OC_WRN("Dynamic memory not available");
-  return -1;
-}
-
-long
-oc_get_mtu_size(void)
-{
-  OC_WRN("Dynamic memory not available");
-  return -1;
-}
-
-void
-oc_set_max_app_data_size(size_t size)
-{
-  (void)size;
-  OC_WRN("Dynamic memory not available");
-}
-
-long
-oc_get_max_app_data_size(void)
-{
-  OC_WRN("Dynamic memory not available");
-  return -1;
-}
-
-void
-oc_set_min_app_data_size(size_t size)
-{
-  (void)size;
-  OC_WRN("Dynamic memory not available");
-}
-
-long
-oc_get_min_app_data_size(void)
-{
-  OC_WRN("Dynamic memory not available");
-  return -1;
-}
-
-long
-oc_get_block_size(void)
-{
-  OC_WRN("Dynamic memory not available");
-  return -1;
-}
-#endif /* OC_DYNAMIC_ALLOCATION */
-
 static void
 oc_shutdown_all_devices(void)
 {

api/oc_session_events.c

@@ -22,7 +22,6 @@
 #include "api/oc_session_events_internal.h"
 #include "oc_api.h"
 #include "oc_buffer.h"
-#include "oc_network_monitor.h"
 #include "oc_session_events.h"
 #include "oc_signal_event_loop.h"
 #include "port/oc_connectivity_internal.h"

api/plgd/device-provisioning-client/plgd_dps.c

@@ -30,7 +30,10 @@
 #include "api/oc_tcp_internal.h"
 #include "oc_certs.h"
 #include "oc_core_res.h"
+
+#ifdef OC_NETWORK_MONITOR
 #include "oc_network_monitor.h"
+#endif /* OC_NETWORK_MONITOR */
 
 #include <assert.h>
 #include <inttypes.h>
@@ -226,13 +229,17 @@ plgd_dps_session_callbacks_deinit(plgd_dps_context_t *ctx)
 void
 plgd_dps_interface_callbacks_init(void)
 {
+#ifdef OC_NETWORK_MONITOR
   oc_add_network_interface_event_callback(dps_interface_event_handler);
+#endif /* OC_NETWORK_MONITOR */
 }
 
 void
 plgd_dps_interface_callbacks_deinit(void)
 {
+#ifdef OC_NETWORK_MONITOR
   oc_remove_network_interface_event_callback(dps_interface_event_handler);
+#endif /* OC_NETWORK_MONITOR */
 }
 
 #endif /* OC_SESSION_EVENTS */

api/plgd/device-provisioning-client/plgd_dps_manager.c

@@ -30,7 +30,6 @@
 #include "plgd_dps_internal.h"
 
 #include "oc_cred.h"
-#include "oc_network_monitor.h"
 #include "security/oc_cred_util_internal.h"
 #include "util/oc_list.h"
 

api/plgd/unittest/plgdtimetest.cpp

@@ -35,7 +35,6 @@
 #include "messaging/coap/transactions_internal.h"
 #include "oc_acl.h"
 #include "oc_core_res.h"
-#include "oc_network_monitor.h"
 #include "oc_ri.h"
 #include "port/oc_log_internal.h"
 #include "port/oc_network_event_handler_internal.h"