mirror of
https://dev.iopsys.eu/bbf/icwmp.git
synced 2026-03-12 12:08:44 +01:00
add Ethernet interfaces data model parameters
This commit is contained in:
Anis Ellouze
parent
81d64e6438
commit
2d050d0515
5 changed files with 371 additions and 5 deletions
|
|
@ -43,14 +43,15 @@ icwmpd_SOURCES = \
|
|||
if DATAMODEL_TR098
|
||||
icwmpd_SOURCES += \
|
||||
../dm/dmtree/tr098/lan_interfaces.c \
|
||||
../dm/dmtree/tr098/landevice.c \
|
||||
../dm/dmtree/tr098/landevice.c \
|
||||
../dm/dmtree/tr098/layer_2_bridging.c \
|
||||
../dm/dmtree/tr098/wandevice.c \
|
||||
../dm/dmtree/tr098/wandevice.c \
|
||||
../dm/dmtree/tr098/x_inteno_se_wifi.c
|
||||
endif
|
||||
if DATAMODEL_TR181
|
||||
icwmpd_SOURCES += \
|
||||
../dm/dmtree/tr181/wifi.c
|
||||
../dm/dmtree/tr181/wifi.c \
|
||||
../dm/dmtree/tr181/ethernet.c
|
||||
endif
|
||||
icwmpd_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
#include "dmentry.h"
|
||||
#include "dmcommon.h"
|
||||
#include "wifi.h"
|
||||
#include "ethernet.h"
|
||||
|
||||
static char *get_parameter_notification (char *param);
|
||||
static int remove_parameter_notification(char *param);
|
||||
|
|
@ -113,6 +114,7 @@ struct prefix_method prefix_methods[] = {
|
|||
{ DMROOT"X_INTENO_SE_SyslogCfg.", 1, NULL, 0, &entry_method_root_syslog },
|
||||
#ifdef DATAMODEL_TR181
|
||||
{ DMROOT"Wifi.", 1, NULL, 0, &entry_method_root_Wifi },
|
||||
{ DMROOT"Ethernet.", 1, NULL, 0, &entry_method_root_Ethernet },
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
|||
332
dm/dmtree/tr181/ethernet.c
Normal file
332
dm/dmtree/tr181/ethernet.c
Normal file
|
|
@ -0,0 +1,332 @@
|
|||
/*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Copyright (C) 2016 Inteno Broadband Technology AB
|
||||
* Author: Anis Ellouze <anis.ellouze@pivasoftware.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#include <uci.h>
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include "dmuci.h"
|
||||
#include "dmubus.h"
|
||||
#include "dmcwmp.h"
|
||||
#include "dmcommon.h"
|
||||
#include "ethernet.h"
|
||||
|
||||
struct eth_port_args cur_eth_port_args = {0};
|
||||
|
||||
inline int init_eth_port(struct dmctx *ctx, struct uci_section *s, char *ifname)
|
||||
{
|
||||
struct eth_port_args *args = &cur_eth_port_args;
|
||||
ctx->args = (void *)args;
|
||||
args->eth_port_sec = s;
|
||||
args->ifname = ifname;
|
||||
return 0;
|
||||
}
|
||||
|
||||
///////////////////SET & GET ALIAS////////////////////////////////////
|
||||
int get_eth_port_alias(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
dmuci_get_value_by_section_string(cur_eth_port_args.eth_port_sec, "ethportalias", value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int set_eth_port_alias(char *refparam, struct dmctx *ctx, int action, char *value)
|
||||
{
|
||||
switch (action) {
|
||||
case VALUECHECK:
|
||||
return 0;
|
||||
case VALUESET:
|
||||
dmuci_set_value_by_section(cur_eth_port_args.eth_port_sec, "ethportalias", value);
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
//////////////////////////GET & SET ETH PARAM////////////////:
|
||||
int get_eth_port_enable(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
json_object *res;
|
||||
|
||||
dmubus_call("network.device", "status", UBUS_ARGS{{"name", cur_eth_port_args.ifname}}, 1, &res);
|
||||
DM_ASSERT(res, *value = "");
|
||||
json_select(res, "link", -1, NULL, value, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int set_eth_port_enable(char *refparam, struct dmctx *ctx, int action, char *value)
|
||||
{
|
||||
bool b;
|
||||
|
||||
switch (action) {
|
||||
case VALUECHECK:
|
||||
if (string_to_bool(value, &b))
|
||||
return FAULT_9007;
|
||||
return 0;
|
||||
case VALUESET:
|
||||
string_to_bool(value, &b);
|
||||
if (b) {
|
||||
DMCMD("ethctl", 3, cur_eth_port_args.ifname, "phy-power", "up"); //TODO wait ubus command
|
||||
}
|
||||
else {
|
||||
DMCMD("ethctl", 3, cur_eth_port_args.ifname, "phy-power", "down"); //TODO wait ubus command
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_eth_port_status(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
bool b;
|
||||
|
||||
get_eth_port_enable(refparam, ctx, value);
|
||||
string_to_bool(*value, &b);
|
||||
if (b)
|
||||
*value = "Up";
|
||||
else
|
||||
*value = "Down";
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_eth_port_maxbitrate(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
char *pch, *spch, *v;
|
||||
int len;
|
||||
|
||||
dmuci_get_option_value_string("ports", "@ethports[0]", cur_eth_port_args.ifname, value);
|
||||
if ((*value)[0] == '\0')
|
||||
return 0;
|
||||
else {
|
||||
if (strcmp(*value, "auto") == 0)
|
||||
*value = "Auto";
|
||||
else {
|
||||
v = dmstrdup(*value);
|
||||
pch = strtok_r(v, "FHfh", &spch);
|
||||
len = strlen(pch) + 1;
|
||||
*value = pch;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int set_eth_port_maxbitrate(char *refparam, struct dmctx *ctx, int action, char *value)
|
||||
{
|
||||
char *val = NULL;
|
||||
char *duplex;
|
||||
|
||||
switch (action) {
|
||||
case VALUECHECK:
|
||||
return 0;
|
||||
case VALUESET:
|
||||
if (strcasecmp(value, "auto") == 0) {
|
||||
dmuci_set_value("ports", "@ethports[0]", cur_eth_port_args.ifname, "auto");
|
||||
return 0;
|
||||
} else {
|
||||
dmuci_get_option_value_string("ports", "@ethports[0]", cur_eth_port_args.ifname, &duplex);
|
||||
if (strcmp(duplex, "auto") == 0)
|
||||
duplex = "FD";
|
||||
else {
|
||||
if (strstr(duplex, "FD"))
|
||||
duplex = "FD";
|
||||
else if (strstr(duplex, "HD"))
|
||||
duplex = "HD";
|
||||
else
|
||||
duplex = "FD";
|
||||
}
|
||||
dmastrcat(&val, value, duplex);
|
||||
dmuci_set_value("ports", "@ethports[0]", cur_eth_port_args.ifname, val);
|
||||
dmfree(val);
|
||||
}
|
||||
return 0;
|
||||
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_eth_port_name(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
dmuci_get_value_by_section_string(cur_eth_port_args.eth_port_sec, "name", value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_eth_port_mac_address(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
json_object *res;
|
||||
|
||||
dmubus_call("network.device", "status", UBUS_ARGS{{"name", cur_eth_port_args.ifname}}, 1, &res);
|
||||
DM_ASSERT(res, *value = "");
|
||||
json_select(res, "macaddr", -1, NULL, value, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_eth_port_duplexmode(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
char *tmp;
|
||||
|
||||
dmuci_get_option_value_string("ports", "@ethports[0]", cur_eth_port_args.ifname, &tmp);
|
||||
if (strcmp(tmp, "auto") == 0) {
|
||||
*value = "Auto";
|
||||
}
|
||||
else if (tmp[0] == '\0') {
|
||||
*value = "";
|
||||
}
|
||||
else {
|
||||
if (strstr(tmp, "FD"))
|
||||
*value = "Full";
|
||||
else if (strstr(tmp, "HD"))
|
||||
*value = "Half";
|
||||
else
|
||||
*value = "";
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int set_eth_port_duplexmode(char *refparam, struct dmctx *ctx, int action, char *value)
|
||||
{
|
||||
char *m, *spch, *rate, *val = NULL;
|
||||
|
||||
switch (action) {
|
||||
case VALUECHECK:
|
||||
return 0;
|
||||
case VALUESET:
|
||||
if (strcasecmp(value, "auto") == 0) {
|
||||
dmuci_set_value("ports", "@ethports[0]", cur_eth_port_args.ifname, "auto");
|
||||
return 0;
|
||||
}
|
||||
dmuci_get_option_value_string("ports", "@ethports[0]", cur_eth_port_args.ifname, &m);
|
||||
m = dmstrdup(m);
|
||||
rate = m;
|
||||
if (strcmp(rate, "auto") == 0)
|
||||
rate = "100";
|
||||
else {
|
||||
strtok_r(rate, "FHfh", &spch);
|
||||
}
|
||||
if (strcmp(value, "full") == 0)
|
||||
dmastrcat(&val, rate, "FD");
|
||||
else if (strcmp(value, "half") == 0)
|
||||
dmastrcat(&val, rate, "HD");
|
||||
else {
|
||||
dmfree(m);
|
||||
return 0;
|
||||
}
|
||||
dmuci_set_value("ports", "@ethports[0]", cur_eth_port_args.ifname, val);
|
||||
dmfree(m);
|
||||
dmfree(val);
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_eth_port_stats_tx_bytes(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
json_object *res;
|
||||
struct ldethargs *ethargs = (struct ldethargs *)ctx->args;
|
||||
|
||||
dmubus_call("network.device", "status", UBUS_ARGS{{"name", cur_eth_port_args.ifname}}, 1, &res);
|
||||
DM_ASSERT(res, *value = "");
|
||||
json_select(res, "statistics", 0, "tx_bytes", value, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_eth_port_stats_rx_bytes(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
json_object *res;
|
||||
struct ldethargs *ethargs = (struct ldethargs *)ctx->args;
|
||||
|
||||
dmubus_call("network.device", "status", UBUS_ARGS{{"name", cur_eth_port_args.ifname}}, 1, &res);
|
||||
DM_ASSERT(res, *value = "");
|
||||
json_select(res, "statistics", 0, "rx_bytes", value, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_eth_port_stats_tx_packets(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
json_object *res;
|
||||
struct ldethargs *ethargs = (struct ldethargs *)ctx->args;
|
||||
|
||||
dmubus_call("network.device", "status", UBUS_ARGS{{"name", cur_eth_port_args.ifname}}, 1, &res);
|
||||
DM_ASSERT(res, *value = "");
|
||||
json_select(res, "statistics", 0, "tx_packets", value, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_eth_port_stats_rx_packets(char *refparam, struct dmctx *ctx, char **value)
|
||||
{
|
||||
json_object *res;
|
||||
struct ldethargs *ethargs = (struct ldethargs *)ctx->args;
|
||||
|
||||
dmubus_call("network.device", "status", UBUS_ARGS{{"name", cur_eth_port_args.ifname}}, 1, &res);
|
||||
DM_ASSERT(res, *value = "");
|
||||
json_select(res, "statistics", 0, "rx_packets", value, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/////////////////////ENTRY METHOD //////////////////////////
|
||||
int entry_method_root_Ethernet(struct dmctx *ctx)
|
||||
{
|
||||
IF_MATCH(ctx, DMROOT"Ethernet.") {
|
||||
DMOBJECT(DMROOT"Ethernet.", ctx, "0", 0, NULL, NULL, NULL);
|
||||
SUBENTRY(entry_method_eth_interface, ctx);
|
||||
SUBENTRY(entry_method_eth_vlan, ctx);
|
||||
return 0;
|
||||
}
|
||||
return FAULT_9005;
|
||||
}
|
||||
|
||||
inline int entry_method_eth_interface(struct dmctx *ctx)
|
||||
{
|
||||
char *int_num = NULL, *int_num_last = NULL, *ifname;
|
||||
struct uci_section *ss = NULL;
|
||||
|
||||
uci_foreach_sections("ports", "ethport", ss) {
|
||||
dmuci_get_value_by_section_string(ss, "ifname", &ifname);
|
||||
init_eth_port(ctx, ss, ifname);
|
||||
int_num = handle_update_instance(1, ctx, &int_num_last, update_instance_alias, 3, ss, "ethportinstance", "ethportalias");
|
||||
SUBENTRY(entry_eth_interface_instance, ctx, int_num);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
inline int entry_method_eth_vlan(struct dmctx *ctx)
|
||||
{
|
||||
SUBENTRY(entry_eth_vlan_instance, ctx, "1");
|
||||
return 0;
|
||||
}
|
||||
|
||||
inline int entry_eth_interface_instance(struct dmctx *ctx, char *int_num)
|
||||
{
|
||||
IF_MATCH(ctx, DMROOT"Ethernet.Interface.%s.", int_num) {
|
||||
DMOBJECT(DMROOT"Ethernet.Interface.%s.", ctx, "0", 1, NULL, NULL, NULL, int_num);
|
||||
DMPARAM("Alias", ctx, "1", get_eth_port_alias, set_eth_port_alias, NULL, 0, 1, UNDEF, NULL);
|
||||
DMPARAM("Enable", ctx, "1", get_eth_port_enable, set_eth_port_enable, "xsd:boolean", 0, 1, UNDEF, NULL);
|
||||
DMPARAM("Status", ctx, "0", get_eth_port_status, NULL, NULL, 0, 1, UNDEF, NULL);
|
||||
DMPARAM("MaxBitRate", ctx, "1", get_eth_port_maxbitrate, set_eth_port_maxbitrate, NULL, 0, 1, UNDEF, NULL);
|
||||
DMPARAM("Name", ctx, "0", get_eth_port_name, NULL, NULL, 0, 1, UNDEF, NULL); //TO CHECK R/W
|
||||
DMPARAM("MACAddress", ctx, "0", get_eth_port_mac_address, NULL, NULL, 0, 1, UNDEF, NULL);
|
||||
DMPARAM("DuplexMode", ctx, "1", get_eth_port_duplexmode, set_eth_port_duplexmode, NULL, 0, 1, UNDEF, NULL);
|
||||
DMOBJECT(DMROOT"Ethernet.Interface.%s.Stats.", ctx, "0", 1, NULL, NULL, NULL, int_num);
|
||||
DMPARAM("BytesSent", ctx, "0", get_eth_port_stats_tx_bytes, NULL, "xsd:unsignedInt", 0, 1, UNDEF, NULL);
|
||||
DMPARAM("BytesReceived", ctx, "0", get_eth_port_stats_rx_bytes, NULL, "xsd:unsignedInt", 0, 1, UNDEF, NULL);
|
||||
DMPARAM("PacketsSent", ctx, "0", get_eth_port_stats_tx_packets, NULL, "xsd:unsignedInt", 0, 1, UNDEF, NULL);
|
||||
DMPARAM("PacketsReceived", ctx, "0", get_eth_port_stats_rx_packets, NULL, "xsd:unsignedInt", 0, 1, UNDEF, NULL);
|
||||
return 0;
|
||||
}
|
||||
return FAULT_9005;
|
||||
}
|
||||
|
||||
inline int entry_eth_vlan_instance(struct dmctx *ctx, char *intnum)
|
||||
{
|
||||
IF_MATCH(ctx, DMROOT"Ethernet.VLANTermination.%s.", intnum) {
|
||||
DMOBJECT(DMROOT"Ethernet.VLANTermination.%s.", ctx, "0", 1, NULL, NULL, NULL, intnum);
|
||||
DMPARAM("Alias", ctx, "0", get_empty, NULL, NULL, 0, 1, UNDEF, NULL);
|
||||
DMPARAM("LowerLayers", ctx, "1", get_empty, NULL, NULL, 0, 1, UNDEF, NULL);
|
||||
DMPARAM("VLANID", ctx, "0", get_empty, NULL, NULL, 0, 1, UNDEF, NULL);
|
||||
DMPARAM("X_INTENO_SE_VLANPriority", ctx, "1", get_empty, NULL, NULL, 0, 1, UNDEF, NULL);
|
||||
return 0;
|
||||
}
|
||||
return FAULT_9005;
|
||||
}
|
||||
23
dm/dmtree/tr181/ethernet.h
Normal file
23
dm/dmtree/tr181/ethernet.h
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
/*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Copyright (C) 2016 Inteno Broadband Technology AB
|
||||
* Author: Anis Ellouze <anis.ellouze@pivasoftware.com>
|
||||
*
|
||||
*/
|
||||
#ifndef __ETHERNET_H
|
||||
#define __ETHERNET_H
|
||||
|
||||
struct eth_port_args
|
||||
{
|
||||
struct uci_section *eth_port_sec;
|
||||
char *ifname;
|
||||
};
|
||||
|
||||
|
||||
int entry_method_root_Ethernet(struct dmctx *ctx);
|
||||
|
||||
#endif
|
||||
|
|
@ -1,7 +1,15 @@
|
|||
/*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Copyright (C) 2016 Inteno Broadband Technology AB
|
||||
* Author: Anis Ellouze <anis.ellouze@pivasoftware.com>
|
||||
*
|
||||
*/
|
||||
#ifndef __WIFI_H
|
||||
#define __WIFI_H
|
||||
#include <libubox/blobmsg_json.h>
|
||||
#include <json/json.h>
|
||||
|
||||
struct wifi_radio_args
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue