michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: LwM2M Portfolio object id support

Browse source 
Added support for Portfolio object support because LwM2M v1.1 conformance
test requirement that. This object is only for conformance test purposing.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
This commit is contained in:
Juha Heiskanen 2022-02-04 01:06:18 -08:00 • committed by Anas Nashif
commit 3e04783bbb
4 changed files with 137 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
subsys/net/lib/lwm2m/CMakeLists.txt
View file

@ -40,6 +40,9 @@ zephyr_library_sources_ifdef(CONFIG_LWM2M_LOCATION_OBJ_SUPPORT
zephyr_library_sources_ifdef(CONFIG_LWM2M_GATEWAY_OBJ_SUPPORT
lwm2m_obj_gateway.c
)
zephyr_library_sources_ifdef(CONFIG_LWM2M_PORTFOLIO_OBJ_SUPPORT
lwm2m_obj_portfolio.c
)
# JSON Support
zephyr_library_sources_ifdef(CONFIG_LWM2M_RW_JSON_SUPPORT

5
subsys/net/lib/lwm2m/Kconfig
View file

@ -340,6 +340,11 @@ config LWM2M_SWMGMT_OBJ_SUPPORT
help
Include support for LWM2M Software Management Object (ID 9)
config LWM2M_PORTFOLIO_OBJ_SUPPORT
bool "LwM2M Portfolio object ID support for Conformance test"
help
Include support for LWM2M Portfolio Object (ID 16).
config LWM2M_SWMGMT_MAX_INSTANCE_COUNT
int "Maximum # of object instances"
depends on LWM2M_SWMGMT_OBJ_SUPPORT

128
subsys/net/lib/lwm2m/lwm2m_obj_portfolio.c Normal file
View file

@ -0,0 +1,128 @@
/*
* Copyright (c) 2022 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_MODULE_NAME net_lwm2m_obj_portfolio
#define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
#include <logging/log.h>
LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#include <stdint.h>
#include <init.h>
#include "lwm2m_object.h"
#include "lwm2m_engine.h"
#include "lwm2m_resource_ids.h"
#define PORTFOLIO_VERSION_MAJOR 1
#define PORTFOLIO_VERSION_MINOR 0
#define PORTFOLIO_IDENTITY_ID 0
#define PORTFOLIO_GET_AUTH_DATA_ID 1
#define PORTFOLIO_AUTH_DATA_ID 2
#define PORTFOLIO_AUTH_STATUS_ID 3
#define PORTFOLIO_MAX_ID 4
/* Identity max based on LwM2M v1.1 conformance test requirements */
#define PORTFOLIO_IDENTITY_MAX 4
#define PORTFOLIO_AUTH_DATA_MAX 4
/* Support 2 multi instance object */
#define MAX_INSTANCE_COUNT 2
/* Default Identity buffer length 40 */
#define DEFAULT_IDENTITY_BUFFER_LENGTH 40
/*
* Calculate resource instances as follows:
* start with PORTFOLIO_MAX_ID
* subtract MULTI resources and execute because their counts include 0 resource (3)
* add PORTFOLIO_IDENTITY_ID resource instances
* add PORTFOLIO_AUTH_DATA_ID resource instances
*/
#define RESOURCE_INSTANCE_COUNT (PORTFOLIO_MAX_ID - 3 + \
PORTFOLIO_IDENTITY_MAX + \
PORTFOLIO_AUTH_DATA_MAX)
static struct lwm2m_engine_obj portfolio;
static struct lwm2m_engine_obj_field fields[] = {
OBJ_FIELD_DATA(PORTFOLIO_IDENTITY_ID, RW, STRING), /* Mandatory, multi-instance */
OBJ_FIELD_EXECUTE(PORTFOLIO_GET_AUTH_DATA_ID), /* Optional, ingle-instance */
OBJ_FIELD_DATA(PORTFOLIO_AUTH_DATA_ID, R_OPT, OPAQUE), /* Optional, multi-instance */
OBJ_FIELD_DATA(PORTFOLIO_AUTH_STATUS_ID, R_OPT, U8) /* Optional, single-instance*/
};
static struct lwm2m_engine_obj_inst inst[MAX_INSTANCE_COUNT];
static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][PORTFOLIO_MAX_ID];
static struct lwm2m_engine_res_inst res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
static char identity[MAX_INSTANCE_COUNT*PORTFOLIO_IDENTITY_MAX][DEFAULT_IDENTITY_BUFFER_LENGTH];
static struct lwm2m_engine_obj_inst *portfolio_create(uint16_t obj_inst_id)
{
int index, avail = -1, i = 0, j = 0, indentity_buffer_start = 0;
/* Check that there is no other instance with this ID */
for (index = 0; index < ARRAY_SIZE(inst); index++) {
if (index) {
indentity_buffer_start += PORTFOLIO_IDENTITY_MAX;
}
if (inst[index].obj && inst[index].obj_inst_id == obj_inst_id) {
LOG_ERR("Can not create instance - "
"already existing: %u",
obj_inst_id);
return NULL;
}
/* Save first available slot index */
if (avail < 0 && !inst[index].obj) {
avail = index;
}
}
if (avail < 0) {
LOG_ERR("Can not create instance - no more room: %u", obj_inst_id);
return NULL;
}
(void)memset(res[avail], 0, sizeof(res[avail][0]) * ARRAY_SIZE(res[avail]));
(void)memset(identity[avail], 0, DEFAULT_IDENTITY_BUFFER_LENGTH);
init_res_instance(res_inst[avail], ARRAY_SIZE(res_inst[avail]));
/* initialize instance resource data */
INIT_OBJ_RES_MULTI_DATA(PORTFOLIO_IDENTITY_ID, res[avail], i,
res_inst[avail], j, PORTFOLIO_IDENTITY_MAX, false,
identity[indentity_buffer_start], DEFAULT_IDENTITY_BUFFER_LENGTH);
INIT_OBJ_RES_EXECUTE(PORTFOLIO_GET_AUTH_DATA_ID, res[avail], i, NULL);
INIT_OBJ_RES_MULTI_OPTDATA(PORTFOLIO_AUTH_DATA_ID, res[avail], i, res_inst[avail], j,
PORTFOLIO_AUTH_DATA_MAX, false);
INIT_OBJ_RES_OPTDATA(PORTFOLIO_AUTH_STATUS_ID, res[avail], i, res_inst[avail], j);
inst[avail].resources = res[avail];
inst[avail].resource_count = i;
LOG_DBG("Create LwM2M Portfolio instance: %d", obj_inst_id);
return &inst[avail];
}
static int lwm2m_portfolio_init(const struct device *dev)
{
portfolio.obj_id = LWM2M_OBJECT_PORTFOLIO_ID;
portfolio.version_major = PORTFOLIO_VERSION_MAJOR;
portfolio.version_minor = PORTFOLIO_VERSION_MINOR;
portfolio.is_core = false;
portfolio.fields = fields;
portfolio.field_count = ARRAY_SIZE(fields);
portfolio.max_instance_count = MAX_INSTANCE_COUNT;
portfolio.create_cb = portfolio_create;
lwm2m_register_obj(&portfolio);
return 0;
}
SYS_INIT(lwm2m_portfolio_init, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);