Changed sn_coap_protocol.c to use randLIB for random message ID. (#91)

* Changed sn_coap_protocol.c to use randLIB for random message ID. randLIB now needed to build the coap library.

* Added randLIB dependency to module.json

* Added check for message_id==0 when randomizing, as we dont want to change the api for sn_nsdl.c, that uses it for error cases when sending some messages.

* Added randLiIB include path to unit tests.

* Added randLIB_stub for sn_coap_protocol unit test.

Author: simosillankorva

module.json

@@ -14,7 +14,8 @@
   ],
   "dependencies": {
     "nanostack-libservice": "^3.0.0",
-    "mbed-trace": ">=0.2.0,<2.0.0"
+    "mbed-trace": ">=0.2.0,<2.0.0",
+    "nanostack-randlib": "^1.2.0"
   },
   "targetDependencies": {}
 }

source/libCoap/src/sn_coap_protocol.c

@@ -40,7 +40,9 @@
 #include "sn_coap_protocol.h"
 #include "sn_coap_header_internal.h"
 #include "sn_coap_protocol_internal.h"
+#include "randLIB.h"
 #include "mbed-trace/mbed_trace.h"
+
 #define TRACE_GROUP "coap"
 /* * * * * * * * * * * * * * * * * * * * */
 /* * * * LOCAL FUNCTION PROTOTYPES * * * */
@@ -198,12 +200,12 @@ struct coap_s *sn_coap_protocol_init(void *(*used_malloc_func_ptr)(uint16_t), vo
 #endif /* ENABLE_RESENDINGS */
 
     /* Randomize global message ID */
-#if defined __linux__ || defined TARGET_LIKE_MBED
-    srand(rand()^time(NULL));
-    message_id = rand() % 400 + 100;
-#else
-    message_id = 100;
-#endif
+    randLIB_seed_random();
+    message_id = randLIB_get_16bit();
+    if (message_id == 0) {
+        message_id = 1;
+    }
+    tr_debug("Coap random msg ID: %d", message_id);
 
     return handle;
 }

test/nsdl-c/unittest/makefile_defines.txt

@@ -13,6 +13,7 @@ INCLUDE_DIRS =\
   ../../../../nsdl-c\
   ../../../../yotta_modules/nanostack-libservice/mbed-client-libservice\
   ../../../../yotta_modules/mbed-trace\
+  ../../../../yotta_modules/nanostack-randlib/mbed-client-randlib\
   ../../../../../libService/libService\
   ../../../../source/libCoap/src/include\
   ../../../../source/libNsdl/src/include\

test/nsdl-c/unittest/sn_coap_protocol/Makefile

@@ -12,6 +12,7 @@ TEST_SRC_FILES = \
         ../stubs/sn_coap_parser_stub.c \
         ../stubs/sn_coap_header_check_stub.c \
         ../stubs/ns_list_stub.c \
+        ../stubs/randLIB_stub.cpp \
 
 include ../MakefileWorker.mk
 

test/nsdl-c/unittest/stubs/randLIB_stub.cpp

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2016 ARM Limited. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ * 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 "randLIB_stub.h"
+
+
+uint8_t randLIB_stub::uint8_value;
+uint16_t randLIB_stub::uint16_value;
+uint32_t randLIB_stub::uint32_value;
+uint64_t randLIB_stub::uint64_value;
+void* randLIB_stub::void_value;
+
+extern "C"{
+
+void randLIB_seed_random(void){}
+
+void randLIB_add_seed(uint64_t seed){}
+
+uint8_t randLIB_get_8bit(void)
+{
+    return randLIB_stub::uint8_value;
+}
+
+uint16_t randLIB_get_16bit(void)
+{
+    return randLIB_stub::uint16_value;
+}
+
+uint32_t randLIB_get_32bit(void)
+{
+    return randLIB_stub::uint32_value;
+}
+
+uint64_t randLIB_get_64bit(void)
+{
+    return randLIB_stub::uint64_value;
+}
+
+void *randLIB_get_n_bytes_random(void *data_ptr, uint8_t count)
+{
+    return randLIB_stub::void_value;
+}
+
+uint16_t randLIB_get_random_in_range(uint16_t min, uint16_t max)
+{
+    return randLIB_stub::uint16_value;
+}
+
+uint32_t randLIB_randomise_base(uint32_t base, uint16_t min_factor, uint16_t max_factor)
+{
+    return randLIB_stub::uint32_value;
+}
+
+}
+

test/nsdl-c/unittest/stubs/randLIB_stub.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016 ARM Limited. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ * 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.
+ */
+#ifndef M2M_RANDLIB_STUB_H
+#define M2M_RANDLIB_STUB_H
+
+#include <stdint.h>
+
+//some internal test related stuff
+namespace randLIB_stub
+{
+    extern uint8_t uint8_value;
+    extern uint16_t uint16_value;
+    extern uint32_t uint32_value;
+    extern uint64_t uint64_value;
+    extern void* void_value;
+}
+
+#endif // M2M_RANDLIB_STUB_H