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

Ticket refs #3392: implement Device.Firewall.Chain.{i}.Rule.{i}.ExpiryDate parameter

Browse source
This commit is contained in:
Amin Ben Ramdhane 2021-02-18 19:00:04 +01:00
parent 58ff5de657
commit fcbe0daf80
2 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dmtree/tr181/firewall.c
View file

@ -338,6 +338,45 @@ static int get_FirewallChainRule_CreationDate(char *refparam, struct dmctx *ctx,
return 0;
}
#ifndef GENERIC_OPENWRT
/*#Device.Firewall.Chain.{i}.Rule.{i}.ExpiryDate!UCI:firewall/rule,@i-1/expiry*/
static int get_FirewallChainRule_ExpiryDate(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
char *expiry_date = NULL;
dmuci_get_value_by_section_string((struct uci_section *)data, "expiry", &expiry_date);
if (expiry_date && *expiry_date != '\0' && atoi(expiry_date) > 0) {
char expiry[sizeof "AAAA-MM-JJTHH:MM:SSZ"];
time_t time_value = atoi(expiry_date);
strftime(expiry, sizeof expiry, "%Y-%m-%dT%H:%M:%SZ", localtime(&time_value));
*value = dmstrdup(expiry);
} else {
*value = "9999-12-31T23:59:59Z";
}
return 0;
}
static int set_FirewallChainRule_ExpiryDate(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
char expiry_date[16];
struct tm tm;
switch (action) {
case VALUECHECK:
if (dm_validate_dateTime(value))
return FAULT_9007;
break;
case VALUESET:
strptime(value, "%Y-%m-%dT%H:%M:%SZ", &tm);
snprintf(expiry_date, sizeof(expiry_date), "%ld", mktime(&tm));
dmuci_set_value_by_section((struct uci_section *)data, "expiry", expiry_date);
break;
}
return 0;
}
#endif
static int get_rule_source_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
char *ifaceobj = NULL, *src = NULL, src_iface[256] = {0};
@ -1497,6 +1536,9 @@ DMLEAF tFirewallChainRuleParams[] = {
//{"TargetChain", &DMWRITE, DMT_STRING, get_rule_target_chain, set_rule_target_chain, BBFDM_BOTH},
{"Log", &DMWRITE, DMT_BOOL, get_rule_log, set_rule_log, BBFDM_BOTH},
{"CreationDate", &DMREAD, DMT_TIME, get_FirewallChainRule_CreationDate, NULL, BBFDM_BOTH},
#ifndef GENERIC_OPENWRT
{"ExpiryDate", &DMWRITE, DMT_TIME, get_FirewallChainRule_ExpiryDate, set_FirewallChainRule_ExpiryDate, BBFDM_BOTH},
#endif
{"SourceInterface", &DMWRITE, DMT_STRING, get_rule_source_interface, set_rule_source_interface, BBFDM_BOTH},
{"SourceAllInterfaces", &DMWRITE, DMT_BOOL, get_rule_source_all_interfaces, set_rule_source_all_interfaces, BBFDM_BOTH},
{"DestInterface", &DMWRITE, DMT_STRING, get_rule_dest_interface, set_rule_dest_interface, BBFDM_BOTH},

17
json/tr181.json
View file

@ -66999,7 +66999,22 @@
"cwmp",
"usp"
],
"datatype": "dateTime"
"datatype": "dateTime",
"mapping": [
{
"type": "uci",
"uci": {
"file": "firewall",
"section": {
"type": "rule",
"index": "@i-1"
},
"option": {
"name": "expiry"
}
}
}
]
},
"SourceInterface": {
"type": "string",