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 validation for ExternalPortEndRange

Browse source
This commit is contained in:
vdutta 2022-05-11 17:33:23 +05:30 • committed by Amin Ben Ramdhane
parent 381d47fcb9
commit 6d7d64f99a
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dmtree/tr181/nat.c
View file

@ -582,11 +582,24 @@ static int get_nat_port_mapping_external_port_end_range(char *refparam, struct d
static int set_nat_port_mapping_external_port_end_range(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) static int set_nat_port_mapping_external_port_end_range(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{ {
char *src_dport = NULL, *tmp = NULL, buffer[64]; char *src_dport = NULL, *tmp = NULL, buffer[64];
uint16_t sport, dport;
switch (action) { switch (action) {
case VALUECHECK: case VALUECHECK:
if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1))
return FAULT_9007; return FAULT_9007;
// Add check to check if the endrange > src_dport
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "src_dport", &src_dport);
tmp = src_dport ? DM_STRCHR(src_dport, ':') : NULL;
if (tmp)
*tmp = '\0';
sport = DM_STRTOL(src_dport);
dport = DM_STRTOL(value);
if (dport != 0 && dport < sport)
return FAULT_9007;
return 0; return 0;
case VALUESET: case VALUESET:
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "src_dport", &src_dport); dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "src_dport", &src_dport);
@ -594,10 +607,13 @@ static int set_nat_port_mapping_external_port_end_range(char *refparam, struct d
if (tmp) if (tmp)
*tmp = '\0'; *tmp = '\0';
if ((src_dport[0] == '\0')) sport = DM_STRTOL(src_dport);
snprintf(buffer, sizeof(buffer), "%s:%s", "0", value); dport = DM_STRTOL(value);
if (dport) // if not 0
snprintf(buffer, sizeof(buffer), "%d:%d", sport, dport);
else else
snprintf(buffer, sizeof(buffer), "%s:%s", src_dport, value); snprintf(buffer, sizeof(buffer), "%d", sport);
dmuci_set_value_by_section(((struct dmmap_dup *)data)->config_section, "src_dport", buffer); dmuci_set_value_by_section(((struct dmmap_dup *)data)->config_section, "src_dport", buffer);
return 0; return 0;