From e3a021c1e7bc4bdb877cd12601a55c7e3f74437e Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Mon, 20 Apr 2020 13:17:04 -0400 Subject: [PATCH] Fix block of dynamic route table load A bug in the initialisation of RMR beginning with 3.7.2 was causing the dynamic update of routes to be blocked. This change corrects that bug. Issue-ID: RIC-336 Signed-off-by: E. Scott Daniels Change-Id: I517b0ba65808bb4853983f92bc57e93a22792014 --- CHANGES_CORE.txt | 4 ++++ CMakeLists.txt | 2 +- src/rmr/si/src/rmr_si.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES_CORE.txt b/CHANGES_CORE.txt index 4c86356..89d0595 100644 --- a/CHANGES_CORE.txt +++ b/CHANGES_CORE.txt @@ -5,6 +5,10 @@ # API and build change and fix summaries. Doc correctsions # and/or changes are not mentioned here; see the commit messages. +2020 April 20; version 3.8.2 + Fix bug which was preventing an instance receiving dynamic route + table updates. (RIC-336) + 2020 April 20; version 3.8.1 Add user guide which replaces the concatenation of man pages (RIC-328) diff --git a/CMakeLists.txt b/CMakeLists.txt index 863cd57..3109513 100644 --- 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 "8" ) -set( patch_level "1" ) +set( patch_level "2" ) set( install_root "${CMAKE_INSTALL_PREFIX}" ) set( install_inc "include/rmr" ) diff --git a/src/rmr/si/src/rmr_si.c b/src/rmr/si/src/rmr_si.c index 4aefe4a..d1b9f26 100644 --- a/src/rmr/si/src/rmr_si.c +++ b/src/rmr/si/src/rmr_si.c @@ -623,7 +623,7 @@ static void* init( char* uproto_port, int def_msg_size, int flags ) { port = proto_port; // assume something like "1234" was passed } - if( (tok = getenv( ENV_RTG_PORT )) != NULL && atoi( tok ) < 1 ) { // must check here -- if < 1 then we just start static file 'listener' + if( (tok = getenv( ENV_RTG_PORT )) != NULL && atoi( tok ) < 0 ) { // must check here -- if < 0 then we just start static file 'listener' static_rtc = 1; } -- 2.16.6