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

BB: sync questd from IOP3

Browse source
This commit is contained in:
Sukru Senli 2015-04-14 16:03:41 +02:00 • committed by Martin Schröder
parent 7ac1319dc0
commit 81576f171e
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
questd/src/Makefile
View file

@ -2,8 +2,8 @@ CC = gcc
CFLAGS = -g -Wall
LOCLIBS =
LIBS = -luci -lubus -lubox -lpthread
OBJS = questd.o dumper.o port.o arping.o usb.o ndisc.o
SRCS = questd.c dumper.c port.c arping.c usb.c ndisc.c
OBJS = questd.o dumper.o port.o arping.o usb.o ndisc.o dslstats.o
SRCS = questd.c dumper.c port.c arping.c usb.c ndisc.c dslstats.c
LIBSRCS =
ISRCS = questd.h

18
questd/src/questd.c
View file

@ -48,7 +48,6 @@ static Key keys;
static Spec spec;
static USB usb[MAX_USB];
/* POLICIES */
enum {
QUEST_NAME,
@ -1155,6 +1154,20 @@ quest_router_networks(struct ubus_context *ctx, struct ubus_object *obj,
return 0;
}
static int quest_router_dslstats(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg){
struct blob_attr *tb[__QUEST_MAX];
blobmsg_parse(quest_policy, __QUEST_MAX, tb, blob_data(msg), blob_len(msg));
blob_buf_init(&bb, 0);
dslstats_to_blob_buffer(&router.dslstats, &bb);
ubus_send_reply(ctx, req, bb.head);
return 0;
}
static int
quest_router_clients(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
@ -1422,6 +1435,7 @@ static struct ubus_method router_object_methods[] = {
UBUS_METHOD_NOARG("info", quest_router_info),
UBUS_METHOD("quest", quest_router_specific, quest_policy),
{ .name = "networks", .handler = quest_router_networks },
{ .name = "dslstats", .handler = quest_router_dslstats },
UBUS_METHOD("client", quest_router_network_clients, network_policy),
{ .name = "clients", .handler = quest_router_clients },
{ .name = "clients6", .handler = quest_router_clients6 },
@ -1511,6 +1525,7 @@ void *dump_router_info(void *arg)
jiffy_counts_t cur_jif, prev_jif;
dslstats_init(&router.dslstats);
init_db_hw_config();
load_networks();
@ -1520,6 +1535,7 @@ void *dump_router_info(void *arg)
dump_static_router_info(&router);
dump_hostname(&router);
while (true) {
dslstats_load(&router.dslstats);
dump_sysinfo(&router, &memory);
dump_cpuinfo(&router, &prev_jif, &cur_jif);
populate_clients();

3
questd/src/questd.h
View file

@ -12,6 +12,8 @@
#include <uci.h>
#include "dslstats.h"
#define MAX_VIF 8
#define MAX_NETWORK 16
#define MAX_CLIENT 128
@ -108,6 +110,7 @@ typedef struct {
char uptime[64];
unsigned int procs;
unsigned int cpu;
DSLStats dslstats;
} Router;
typedef struct {