From 338fe5e46223df8145b53cdf52dab358f18c7f26 Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Mon, 30 Mar 2020 11:05:45 -0400 Subject: [PATCH] Correct the max receive message constant The max receive size constant (a user programme only constant) still reflected the original limit of 4k. While internally this was not used and/or enforced, the incorrect setting could cause some wrapper implementations to incorrectly limit the max receive size. This change sets this constant to the acknowledged max receive size for all transports (64K). Issue-ID: RIC-301 Signed-off-by: E. Scott Daniels Change-Id: I214b9d9dd67a00232e57bab8327dcb76f891b517 --- CHANGES_CORE.txt | 3 +++ CMakeLists.txt | 2 +- src/rmr/common/include/rmr.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES_CORE.txt b/CHANGES_CORE.txt index 227f92b..a118752 100644 --- a/CHANGES_CORE.txt +++ b/CHANGES_CORE.txt @@ -5,6 +5,9 @@ # API and build change and fix summaries. Doc correctsions # and/or changes are not mentioned here; see the commit messages. +2020 March 30; version 3.6.3 + Correct the max receive message size constant in rmr.h (RIC-301) + 2020 March 23; version 3.6.2 Fix message initialisation bug when pulling a message from the pool (RIC-295) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae986c9..d0d6a9e 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 "6" ) -set( patch_level "2" ) +set( patch_level "3" ) set( install_root "${CMAKE_INSTALL_PREFIX}" ) set( install_inc "include/rmr" ) diff --git a/src/rmr/common/include/rmr.h b/src/rmr/common/include/rmr.h index 4a8968e..3fc7677 100644 --- a/src/rmr/common/include/rmr.h +++ b/src/rmr/common/include/rmr.h @@ -39,7 +39,7 @@ extern "C" { #define RMR_MAX_MEID 32 // spece in header reserved for managed element id #define RMR_MAX_SRC 64 // max length of hostname (which could be IPv6 addr with [...]:port so more than the 39 bytes of a plain addr #define RMR_MAX_SID 32 // misc sender info/data (reserved) -#define RMR_MAX_RCV_BYTES 4096 // max bytes we support in a receive message +#define RMR_MAX_RCV_BYTES (1024 * 64) // max bytes we support in a receive message // various flags for function calls #define RMRFL_NONE 0x00 // no flags -- 2.16.6