mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move mqtt broker dm to mosquitto

Browse source
This commit is contained in:
Vivek Kumar Dutta 2024-05-30 11:01:28 +05:30
parent 2d65ca3a36
commit 6d9b6a7411
5 changed files with 4 additions and 339 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -121,3 +121,5 @@ All supported tools are presented in this file[BBFDM Tools](./tools/README.md)
| Device.SelfTestDiagnostics. | self-diagnostics | https://dev.iopsys.eu/feed/iopsys.git |
| Device.UPnP. | ssdpd | https://dev.iopsys.eu/feed/iopsys.git |
| Device.IEEE1905. | ieee1905 | https://dev.iopsys.eu/multi-ap/ieee1905.git |
| Device.MQTT.Broker. | mosquitto | https://dev.iopsys.eu/feed/openwrt-packages.git |
| Device.X_IOPSYS_EU_OpenVPN. | openvpn | https://dev.iopsys.eu/feed/openwrt-packages.git |

2
libbbfdm/dmtree/tr181/device.c
View file

@ -22,7 +22,6 @@
#include "security.h"
#include "routeradvertisement.h"
#include "gatewayinfo.h"
#include "mqtt.h"
/*************************************************************
* GET & SET PARAM
@ -82,7 +81,6 @@ DMOBJ tDeviceObj[] = {
{"RouterAdvertisement", &DMREAD, NULL, NULL, "file:/etc/config/dhcp", NULL, NULL, NULL, tRouterAdvertisementObj, tRouterAdvertisementParams, NULL, BBFDM_BOTH, NULL},
{"Services", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, BBFDM_BOTH, NULL},
{"GatewayInfo", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tGatewayInfoParams, NULL, BBFDM_CWMP, NULL},
{"MQTT", &DMREAD, NULL, NULL, "file:/etc/config/mosquitto", NULL, NULL, NULL, tMQTTObj, tMQTTParams, NULL, BBFDM_BOTH, NULL},
{0}
};

317
libbbfdm/dmtree/tr181/mqtt.c
View file

@ -1,317 +0,0 @@
/*
* Copyright (C) 2022 iopsys Software Solutions AB
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation
*
* Author: Suvendhu Hansa <suvendhu.hansa@iopsys.eu>
*/
#include "mqtt.h"
static bool duplicate_entry_exist(char *name, char *section_type)
{
bool exist = false;
struct uci_section *s = NULL, *stmp = NULL;
uci_foreach_sections_safe("mosquitto", section_type, stmp, s) {
char *sec_name = section_name(s);
if (DM_STRCMP(name, sec_name) == 0) {
exist = true;
break;
}
}
return exist;
}
/*************************************************************
* ADD & DEL OBJ
**************************************************************/
static int addMQTTBroker(char *refparam, struct dmctx *ctx, void *data, char **instance)
{
struct uci_section *s = NULL, *dmmap_broker = NULL;
char sec_name[40];
snprintf(sec_name, sizeof(sec_name), "broker_%s", *instance);
if (dmuci_add_section("mosquitto", "listener", &s) == 0) {
dmuci_rename_section_by_section(s, sec_name);
dmuci_set_value_by_section(s, "enabled", "0");
dmuci_set_value_by_section(s, "port", "1883");
dmuci_add_section_bbfdm("dmmap_mqtt", "listener", &dmmap_broker);
dmuci_set_value_by_section(dmmap_broker, "section_name", sec_name);
dmuci_set_value_by_section(dmmap_broker, "listener_instance", *instance);
}
return 0;
}
static int delMQTTBroker(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action)
{
struct uci_section *s = NULL, *stmp = NULL;
switch (del_action) {
case DEL_INST:
dmuci_delete_by_section(((struct dm_data *)data)->config_section, NULL, NULL);
dmuci_delete_by_section(((struct dm_data *)data)->dmmap_section, NULL, NULL);
break;
case DEL_ALL:
uci_foreach_sections_safe("mosquitto", "listener", stmp, s) {
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_mqtt", "listener", section_name(s), &dmmap_section);
dmuci_delete_by_section(dmmap_section, NULL, NULL);
dmuci_delete_by_section(s, NULL, NULL);
}
break;
}
return 0;
}
/*************************************************************
* ENTRY METHOD
*************************************************************/
static int browseMQTTBrokerInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
{
struct dm_data *curr_data = NULL;
LIST_HEAD(dup_list);
char *inst = NULL;
synchronize_specific_config_sections_with_dmmap("mosquitto", "listener", "dmmap_mqtt", &dup_list);
list_for_each_entry(curr_data, &dup_list, list) {
inst = handle_instance(dmctx, parent_node, curr_data->dmmap_section, "listener_instance", "listener_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)curr_data, inst) == DM_STOP)
break;
}
free_dmmap_config_dup_list(&dup_list);
return 0;
}
/*************************************************************
* GET & SET PARAM
**************************************************************/
static int get_MQTT_BrokerNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
int cnt = get_number_of_entries(ctx, data, instance, browseMQTTBrokerInst);
dmasprintf(value, "%d", cnt);
return 0;
}
static int get_MQTTBroker_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
return bbf_get_alias(ctx, ((struct dm_data *)data)->dmmap_section, "listener_alias", instance, value);
}
static int set_MQTTBroker_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
return bbf_set_alias(ctx, ((struct dm_data *)data)->dmmap_section, "listener_alias", instance, value);
}
static int get_MQTTBroker_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
*value = dmuci_get_value_by_section_fallback_def(((struct dm_data *)data)->config_section, "enabled", "0");
return 0;
}
static int set_MQTTBroker_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
bool b;
switch (action) {
case VALUECHECK:
if (bbfdm_validate_boolean(ctx, value))
return FAULT_9007;
break;
case VALUESET:
string_to_bool(value, &b);
dmuci_set_value_by_section(((struct dm_data *)data)->config_section, "enabled", b ? "1" : "0");
break;
}
return 0;
}
static int get_MQTTBroker_Name(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dm_data *)data)->dmmap_section, "section_name", value);
return 0;
}
static int set_MQTTBroker_Name(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
char *curr_name = NULL;
switch (action) {
case VALUECHECK:
if (bbfdm_validate_string(ctx, value, -1, 64, NULL, NULL))
return FAULT_9007;
// Check if the value is empty
if (*value == '\0') {
bbfdm_set_fault_message(ctx, "Entry name should not be blank.");
return FAULT_9007;
}
// Check if new name is same as current name
curr_name = section_name(((struct dm_data *)data)->config_section);
if (DM_STRCMP(curr_name, value) == 0)
break;
// check if duplicate entry already exists
if (duplicate_entry_exist(value, "listener")) {
bbfdm_set_fault_message(ctx, "Entry name '%s' is already exist.", value);
return FAULT_9001;
}
break;
case VALUESET:
// If new name is same as current name then nothing to do
curr_name = section_name(((struct dm_data *)data)->config_section);
if (DM_STRCMP(curr_name, value) == 0)
break;
// Update mosquitto config
if (0 != dmuci_rename_section_by_section(((struct dm_data *)data)->config_section, value)) {
bbfdm_set_fault_message(ctx, "Rename the entry name with '%s' value was failed.", value);
return FAULT_9001;
}
// Update dmmap_mqtt file
dmuci_set_value_by_section(((struct dm_data *)data)->dmmap_section, "section_name", value);
break;
}
return 0;
}
static int get_MQTTBroker_Port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dm_data *)data)->config_section, "port", value);
return 0;
}
static int set_MQTTBroker_Port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
switch (action) {
case VALUECHECK:
if (bbfdm_validate_unsignedInt(ctx, value, RANGE_ARGS{{"1",NULL}}, 1))
return FAULT_9007;
break;
case VALUESET:
dmuci_set_value_by_section(((struct dm_data *)data)->config_section, "port", value);
break;
}
return 0;
}
static int get_MQTTBroker_Interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
char *intf = NULL;
dmuci_get_value_by_section_string(((struct dm_data *)data)->config_section, "interface", &intf);
_bbfdm_get_references(ctx, "Device.IP.Interface.", "Name", intf, value);
return 0;
}
static int set_MQTTBroker_Interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
char *allowed_objects[] = {"Device.IP.Interface.", NULL};
struct dm_reference reference = {0};
bbfdm_get_reference_linker(ctx, value, &reference);
switch (action) {
case VALUECHECK:
if (bbfdm_validate_string(ctx, reference.path, -1, 256, NULL, NULL))
return FAULT_9007;
if (dm_validate_allowed_objects(ctx, &reference, allowed_objects))
return FAULT_9007;
break;
case VALUESET:
dmuci_set_value_by_section(((struct dm_data *)data)->config_section, "interface", reference.value);
break;
}
return 0;
}
static int get_MQTTBroker_Username(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dm_data *)data)->config_section, "username", value);
return 0;
}
static int set_MQTTBroker_Username(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
switch (action) {
case VALUECHECK:
if (bbfdm_validate_string(ctx, value, -1, 64, NULL, NULL))
return FAULT_9007;
// Check if the value is empty
if (*value == '\0') {
bbfdm_set_fault_message(ctx, "Username value should not be blank.");
return FAULT_9007;
}
break;
case VALUESET:
dmuci_set_value_by_section(((struct dm_data *)data)->config_section, "username", value);
break;
}
return 0;
}
static int get_MQTTBroker_Password(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dm_data *)data)->config_section, "password", value);
return 0;
}
static int set_MQTTBroker_Password(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
switch (action) {
case VALUECHECK:
if (bbfdm_validate_string(ctx, value, -1, 64, NULL, NULL))
return FAULT_9007;
break;
case VALUESET:
dmuci_set_value_by_section(((struct dm_data *)data)->config_section, "password", value);
break;
}
return 0;
}
/**********************************************************************************************************************************
* OBJ & LEAF DEFINITION
**********************************************************************************************************************************/
/* *** Device.MQTT.Broker. *** */
DMOBJ tMQTTObj[] = {
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, dynamicleaf, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
{"Broker", &DMWRITE, addMQTTBroker, delMQTTBroker, NULL, browseMQTTBrokerInst, NULL, NULL, NULL, tMQTTBrokerParams, NULL, BBFDM_BOTH, NULL},
{0}
};
DMLEAF tMQTTParams[] = {
/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
{"BrokerNumberOfEntries", &DMREAD, DMT_UNINT, get_MQTT_BrokerNumberOfEntries, NULL, BBFDM_BOTH},
{0}
};
DMLEAF tMQTTBrokerParams[] = {
/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
{"Enable", &DMWRITE, DMT_BOOL, get_MQTTBroker_Enable, set_MQTTBroker_Enable, BBFDM_BOTH},
{"Alias", &DMWRITE, DMT_STRING, get_MQTTBroker_Alias, set_MQTTBroker_Alias, BBFDM_BOTH, DM_FLAG_UNIQUE},
{"Name", &DMWRITE, DMT_STRING, get_MQTTBroker_Name, set_MQTTBroker_Name, BBFDM_BOTH, DM_FLAG_UNIQUE},
//{"Status", &DMREAD, DMT_STRING, get_MQTTBroker_Status, NULL, BBFDM_BOTH},
{"Port", &DMWRITE, DMT_UNINT, get_MQTTBroker_Port, set_MQTTBroker_Port, BBFDM_BOTH},
{"Interface", &DMWRITE, DMT_STRING, get_MQTTBroker_Interface, set_MQTTBroker_Interface, BBFDM_BOTH, DM_FLAG_REFERENCE},
{"Username", &DMWRITE, DMT_STRING, get_MQTTBroker_Username, set_MQTTBroker_Username, BBFDM_BOTH},
{"Password", &DMWRITE, DMT_STRING, get_MQTTBroker_Password, set_MQTTBroker_Password, BBFDM_BOTH, DM_FLAG_SECURE},
{0}
};

19
libbbfdm/dmtree/tr181/mqtt.h
View file

@ -1,19 +0,0 @@
/*
* Copyright (C) 2022 iopsys Software Solutions AB
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation
*
* Author: Suvendhu Hansa <suvendhu.hansa@iopsys.eu>
*/
#ifndef _MQTT_H
#define _MQTT_H
#include "libbbfdm-api/dmcommon.h"
extern DMOBJ tMQTTObj[];
extern DMLEAF tMQTTParams[];
extern DMLEAF tMQTTBrokerParams[];
#endif

3
tools/tools_input.json
View file

@ -135,7 +135,8 @@
"proto": "git",
"version": "devel",
"dm_files": [
"net/openvpn/files/bbfdm/OpenVPN_DM.json"
"net/openvpn/files/bbfdm/OpenVPN_DM.json",
"net/mosquitto/files/mqtt_broker_plugin.json"
]
},
{