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

Fix pipeline

Browse source
This commit is contained in:
Vivek Kumar Dutta 2024-10-16 12:01:50 +05:30
parent 52dd299af2
commit 6c466f143b
3 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gitlab-ci/setup.sh
View file

@ -18,7 +18,6 @@ cp -r ./test/files/lib/* /lib/
mkdir -p /tmp/bbfdm/.bbfdm /tmp/bbfdm/.cwmp /tmp/bbfdm/.usp mkdir -p /tmp/bbfdm/.bbfdm /tmp/bbfdm/.cwmp /tmp/bbfdm/.usp
cp ./gitlab-ci/core_service.conf /etc/supervisor/conf.d/ cp ./gitlab-ci/core_service.conf /etc/supervisor/conf.d/
cp ./gitlab-ci/reload_service.conf /etc/supervisor/conf.d/
rm -f /etc/bbfdm/dmmap/* rm -f /etc/bbfdm/dmmap/*

1
gitlab-ci/shared.sh
View file

@ -72,6 +72,7 @@ function install_libbbf()
echo "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04" > /etc/bbfdm/.secure_hash echo "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04" > /etc/bbfdm/.secure_hash
cd .. cd ..
exec_cmd cp utilities/bbf_configd /usr/sbin/ exec_cmd cp utilities/bbf_configd /usr/sbin/
exec_cmd cp utilities/files/usr/libexec/rpcd/bbf.config /usr/libexec/rpcd/bbf.config
} }
function install_libbbf_test() function install_libbbf_test()

48
utilities/src/ubus/bbf_config.c
View file

@ -26,12 +26,16 @@
#define CONFIG_CONFDIR "/etc/config/" #define CONFIG_CONFDIR "/etc/config/"
#define DMMAP_CONFDIR "/etc/bbfdm/dmmap/" #define DMMAP_CONFDIR "/etc/bbfdm/dmmap/"
uint8_t g_log_level = 0; uint8_t g_log_level = 1;
void print_log(const char *format, ...); void print_log(const char *format, ...);
#define LOG(fmt, args...) \ #define PRINT_ERR(fmt, args...) \
print_log(fmt, ##args) print_err(fmt, ##args)
#define PRINT_INFO(fmt, args...) \
print_info(fmt, ##args)
struct proto_args { struct proto_args {
const char *name; const char *name;
@ -89,16 +93,24 @@ static const struct blobmsg_policy bbf_config_policy[] = {
[SERVICES_RELOAD] = { .name = "reload", .type = BLOBMSG_TYPE_BOOL }, [SERVICES_RELOAD] = { .name = "reload", .type = BLOBMSG_TYPE_BOOL },
}; };
void print_log(const char *format, ...) void print_info(const char *format, ...)
{ {
va_list arglist; va_list arglist;
if (g_log_level < 1) if (g_log_level > 1) {
return;
va_start(arglist, format); va_start(arglist, format);
vsyslog(LOG_INFO, format, arglist); vsyslog(LOG_INFO, format, arglist);
va_end(arglist); va_end(arglist);
}
}
void print_err(const char *format, ...)
{
va_list arglist;
va_start(arglist, format);
vsyslog(LOG_ERR, format, arglist);
va_end(arglist);
} }
static unsigned char get_idx_by_proto(const char *proto) static unsigned char get_idx_by_proto(const char *proto)
@ -429,11 +441,11 @@ static void send_bbf_config_change_event()
ctx = ubus_connect(NULL); ctx = ubus_connect(NULL);
if (ctx == NULL) { if (ctx == NULL) {
LOG("Can't create UBUS context for event"); PRINT_ERR("Can't create UBUS context for event");
return; return;
} }
LOG("Sending bbf.config.change event"); PRINT_INFO("Sending bbf.config.change event");
memset(&bb, 0, sizeof(struct blob_buf)); memset(&bb, 0, sizeof(struct blob_buf));
blob_buf_init(&bb, 0); blob_buf_init(&bb, 0);
@ -452,7 +464,7 @@ static int bbf_config_commit_handler(struct ubus_context *ctx, struct ubus_objec
unsigned char idx = 0; unsigned char idx = 0;
bool monitor = true, reload = true; bool monitor = true, reload = true;
LOG("Commit handler called"); PRINT_INFO("Commit handler called");
memset(package, 0, sizeof(struct config_package) * MAX_PACKAGE_NUM); memset(package, 0, sizeof(struct config_package) * MAX_PACKAGE_NUM);
memset(&bb, 0, sizeof(struct blob_buf)); memset(&bb, 0, sizeof(struct blob_buf));
@ -510,7 +522,7 @@ end:
ubus_send_reply(ctx, req, bb.head); ubus_send_reply(ctx, req, bb.head);
blob_buf_free(&bb); blob_buf_free(&bb);
LOG("Commit handler exit"); PRINT_INFO("Commit handler exit");
return 0; return 0;
} }
@ -525,7 +537,7 @@ static int bbf_config_revert_handler(struct ubus_context *ctx, struct ubus_objec
memset(&bb, 0, sizeof(struct blob_buf)); memset(&bb, 0, sizeof(struct blob_buf));
blob_buf_init(&bb, 0); blob_buf_init(&bb, 0);
LOG("Revert handler called"); PRINT_INFO("Revert handler called");
if (blobmsg_parse(bbf_config_policy, __MAX, tb, blob_data(msg), blob_len(msg))) { if (blobmsg_parse(bbf_config_policy, __MAX, tb, blob_data(msg), blob_len(msg))) {
blobmsg_add_string(&bb, "error", "Failed to parse blob"); blobmsg_add_string(&bb, "error", "Failed to parse blob");
goto end; goto end;
@ -557,7 +569,7 @@ end:
ubus_send_reply(ctx, req, bb.head); ubus_send_reply(ctx, req, bb.head);
blob_buf_free(&bb); blob_buf_free(&bb);
LOG("revert handler exit"); PRINT_INFO("revert handler exit");
return 0; return 0;
} }
@ -652,7 +664,7 @@ int main(int argc, char **argv)
uctx = ubus_connect(NULL); uctx = ubus_connect(NULL);
if (uctx == NULL) { if (uctx == NULL) {
printf("Can't create UBUS context"); PRINT_ERR("Failed to get UBUS context");
return -1; return -1;
} }
@ -680,13 +692,17 @@ int main(int argc, char **argv)
uint32_t id; uint32_t id;
ret = ubus_lookup_id(uctx, "service", &id); ret = ubus_lookup_id(uctx, "service", &id);
if (ret) if (ret) {
PRINT_ERR("Failed to get service method, exiting");
goto exit; goto exit;
}
ret = ubus_subscribe(uctx, &sub, id); ret = ubus_subscribe(uctx, &sub, id);
if (ret) if (ret) {
PRINT_ERR("Failed to subscribe to service method, exiting");
goto exit; goto exit;
} }
}
uloop_run(); uloop_run();