michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: Remove the resource type in registration message

Browse source 
Do not include the resource type (rt=) in the registration message when
using the OMA JSON format. This was a workaround specifically for the
Wakaama LwM2M server which is no longer needed since the latest master
branch.

Signed-off-by: Marc Lasch <marc.lasch@husqvarnagroup.com>
This commit is contained in:
Marc Lasch 2023-11-02 14:36:12 +01:00 • committed by Carles Cufí
commit 73bab817a0
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
subsys/net/lib/lwm2m/lwm2m_rw_link_format.c
View file

@ -20,22 +20,19 @@ LOG_MODULE_REGISTER(net_lwm2m_link_format, CONFIG_LWM2M_LOG_LEVEL);
/* /*
* TODO: to implement a way for clients to specify alternate path * TODO: to implement a way for clients to specify alternate path
* via Kconfig (LwM2M specification 8.2.2 Alternate Path) * via Kconfig (LwM2M specification 8.2.2 Alternate Path)
*
* For now, in order to inform server we support JSON format, we have to
* report 'ct=11543' to the server. '</>' is required in order to append
* content attribute. And resource type attribute is appended because of
* Eclipse wakaama will reject the registration when 'rt="oma.lwm2m"' is
* missing.
*/ */
/*
* In order to inform the server about the configured LwM2M content format, we have
* to report 'ct=' with the content type value to the server. The root path '</>'
* is required in order to append the content type attribute.
*/
#if defined(CONFIG_LWM2M_RW_SENML_CBOR_SUPPORT) #if defined(CONFIG_LWM2M_RW_SENML_CBOR_SUPPORT)
#define REG_PREFACE "</>;ct=" STRINGIFY(LWM2M_FORMAT_APP_SENML_CBOR) #define REG_PREFACE "</>;ct=" STRINGIFY(LWM2M_FORMAT_APP_SENML_CBOR)
#elif defined(CONFIG_LWM2M_RW_SENML_JSON_SUPPORT) #elif defined(CONFIG_LWM2M_RW_SENML_JSON_SUPPORT)
#define REG_PREFACE "</>;ct=" STRINGIFY(LWM2M_FORMAT_APP_SEML_JSON) #define REG_PREFACE "</>;ct=" STRINGIFY(LWM2M_FORMAT_APP_SEML_JSON)
#elif defined(CONFIG_LWM2M_RW_JSON_SUPPORT) #elif defined(CONFIG_LWM2M_RW_JSON_SUPPORT)
#define REG_PREFACE "</>;rt=\"oma.lwm2m\"" \ #define REG_PREFACE "</>;ct=" STRINGIFY(LWM2M_FORMAT_OMA_JSON)
";ct=" STRINGIFY(LWM2M_FORMAT_OMA_JSON)
#else #else
#define REG_PREFACE "" #define REG_PREFACE ""
#endif #endif

2
tests/net/lib/lwm2m/content_link_format/src/main.c
View file

@ -156,7 +156,7 @@ ZTEST(net_content_link_format, test_put_begin_bs_discovery)
ZTEST(net_content_link_format, test_put_begin_register) ZTEST(net_content_link_format, test_put_begin_register)
{ {
int ret; int ret;
const char *expected_payload = "</>;rt=\"oma.lwm2m\";ct=11543"; const char *expected_payload = "</>;ct=11543";
test_formatter_data.mode = LINK_FORMAT_MODE_REGISTER; test_formatter_data.mode = LINK_FORMAT_MODE_REGISTER;