Add health check mesage types

This change adds the health check message types to the main
RIC message type list.

Issue-ID: RICAPP-25

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: I9010ae719c27ff5a6271fa8fe05e2499eb83759f

diff --git a/CHANGES b/CHANGES
index 0b2898c..7ea8af9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 API and build change  and fix summaries. Doc correctsions
 and/or changes are not mentioned here; see the commit messages.
 
+2020 March 10; version 3.5.1
+       Add missing health check message types.
+       
 2020 March 9; version 3.5.0
        Added new wormhole send function: rmr_wh_call().
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12958e8..08aee4d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ cmake_minimum_required( VERSION 3.5 )
 
 set( major_version "3" )               # should be automatically populated from git tag later, but until CI process sets a tag we use this
 set( minor_version "5" )
-set( patch_level "0" )
+set( patch_level "1" )
 
 set( install_root "${CMAKE_INSTALL_PREFIX}" )
 set( install_inc "include/rmr" )

diff --git a/src/rmr/common/include/RIC_message_types.h b/src/rmr/common/include/RIC_message_types.h
index 8149a9d..70ff94d 100644 (file)
--- a/src/rmr/common/include/RIC_message_types.h
+++ b/src/rmr/common/include/RIC_message_types.h
@@ -38,6 +38,10 @@
 #define RMRRM_TABLE_STATE                      22              // state of table to route mgr
 
 
+// --- system support messages -----------------------
+#define RIC_HEALTH_CHECK_REQ    100
+#define RIC_HEALTH_CHECK_RESP   101
+
 // --- please keep additions in numerical order ------
 
 #define RIC_SCTP_CONNECTION_FAILURE 1080

diff --git a/src/support/health_ck.c b/src/support/health_ck.c
index b755077..290c500 100644 (file)
--- a/src/support/health_ck.c
+++ b/src/support/health_ck.c
@@ -73,12 +73,6 @@
 #include <rmr.h>
 #include <RIC_message_types.h>
 
-#ifndef RIC_HEALTH_CHECK_REQ
-#define RIC_HEALTH_CHECK_REQ   100
-#define RIC_HEALTH_CHECK_RESP  101
-#endif
-
-
 #define MAX_MSG_SZ     2048            // max size we'll expect back
 #define PAYLOAD_SZ     1024            // size of payload we will send