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

Added a new API to get uptime

Browse source
This commit is contained in:
Amin Ben Romdhane 2023-09-20 17:28:02 +02:00
parent 196fa7098d
commit b17dd7751e
5 changed files with 28 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libbbfdm-api/dmcommon.c
View file

@ -176,6 +176,24 @@ pid_t get_pid(const char *pname)
return -1;
}
char *get_uptime(void)
{
FILE *fp = fopen(UPTIME, "r");
char *uptime = "0";
if (fp != NULL) {
char *pch = NULL, *spch = NULL, buf[64] = {0};
if (fgets(buf, 64, fp) != NULL) {
pch = strtok_r(buf, ".", &spch);
uptime = (pch) ? dmstrdup(pch) : "0";
}
fclose(fp);
}
return uptime;
}
int check_file(char *path)
{
glob_t globbuf;

1
libbbfdm-api/dmcommon.h
View file

@ -206,6 +206,7 @@ struct option_tag_type {
};
pid_t get_pid(const char *pname);
char *get_uptime(void);
int check_file(char *path);
char *cidr2netmask(int bits);
bool is_strword_in_optionvalue(char *optionvalue, char *str);

11
libbbfdm/dmtree/tr181/deviceinfo.c
View file

@ -695,16 +695,7 @@ static int get_device_description(char *refparam, struct dmctx *ctx, void *data,
/*#Device.DeviceInfo.UpTime!PROCFS:/proc/uptime*/
static int get_device_info_uptime(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
FILE *fp = fopen(UPTIME, "r");
if (fp != NULL) {
char *pch = NULL, *spch = NULL, buf[64] = {0};
if (fgets(buf, 64, fp) != NULL) {
pch = strtok_r(buf, ".", &spch);
*value = (pch) ? dmstrdup(pch) : "0";
}
fclose(fp);
}
*value = get_uptime();
return 0;
}

30
libbbfdm/dmtree/tr181/dhcpv4.c
View file

@ -2446,14 +2446,6 @@ static int get_DHCPv4Client_DNSServers(char *refparam, struct dmctx *ctx, void *
static int get_DHCPv4Client_LeaseTimeRemaining(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
struct uci_section *dhcpv4_s = ((struct dhcp_client_args *)data)->iface_s;
FILE *fp = NULL;
int lease_time;
char *uptime_str;
char *uptime = 0;
int lease_uptime = 0;
char *pch = NULL, *spch = NULL;
char buf[16];
int lease_remaining;
if (dhcpv4_s) {
json_object *res = NULL;
@ -2461,24 +2453,16 @@ static int get_DHCPv4Client_LeaseTimeRemaining(char *refparam, struct dmctx *ctx
char *if_name = section_name(dhcpv4_s);
dmubus_call("network.interface", "status", UBUS_ARGS{{"interface", if_name, String}}, 1, &res);
DM_ASSERT(res, *value = "0");
*value = dmjson_get_value(res, 2, "data", "leasetime");
lease_time = atoi(*value);
if (lease_time == 0xFFFFFFFF) {
char *lease_time = dmjson_get_value(res, 2, "data", "leasetime");
char *uptime_str = dmjson_get_value(res, 2, "data", "uptime");
if (!DM_STRLEN(uptime_str) || !DM_STRLEN(lease_time) || DM_STRTOL(lease_time) == 0xFFFFFFFF) {
*value = "-1";
return 0;
}
fp = fopen("/proc/uptime", "r");
if (fp != NULL) {
if (fgets(buf, 16, fp) != NULL) {
pch = strtok_r(buf, ".", &spch);
uptime = (pch) ? dmstrdup(pch) : "0";
uptime_str = dmjson_get_value(res, 2, "data", "uptime");
lease_uptime = atoi(uptime_str);
lease_remaining = lease_time - (atoi(uptime) - lease_uptime);
sprintf(*value, "%d", lease_remaining);
}
fclose(fp);
}
char *uptime = get_uptime();
dmasprintf(value, "%ld", DM_STRTOL(lease_time) - (DM_STRTOL(uptime) - DM_STRTOL(uptime_str)));
}
return 0;
}

10
libbbfdm/dmtree/tr181/dynamicdns.c
View file

@ -767,15 +767,7 @@ static int get_DynamicDNSClientHostname_LastUpdate(char *refparam, struct dmctx
} else
last_time = "0";
fp = fopen("/proc/uptime", "r");
if (fp != NULL) {
if (fgets(buf, 16, fp) != NULL) {
pch = strtok_r(buf, ".", &spch);
uptime = (pch) ? dmstrdup(pch) : "0";
}
fclose(fp);
} else
uptime = "0";
uptime = get_uptime();
epoch_time = now - DM_STRTOL(uptime) + DM_STRTOL(last_time);
if ((ts = gmtime(&epoch_time)) == NULL)