From da50b98f5b0a9539edf97b3ffda4bf5a030dfa18 Mon Sep 17 00:00:00 2001 From: Amin Ben Ramdhane Date: Wed, 8 May 2019 16:42:25 +0100 Subject: [PATCH] Ticket refs#674: TR-181: Device.NAT object --- dm/dmtree/common/root.c | 2 +- dm/dmtree/tr181/nat.c | 507 +++++++++++++++++++++++++++++++++++++--- dm/dmtree/tr181/nat.h | 51 +++- 3 files changed, 522 insertions(+), 38 deletions(-) diff --git a/dm/dmtree/common/root.c b/dm/dmtree/common/root.c index 796ced1..0de520f 100644 --- a/dm/dmtree/common/root.c +++ b/dm/dmtree/common/root.c @@ -137,7 +137,7 @@ DMOBJ tRoot_181_Obj[] = { {"DHCPv4", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tDhcpv4Obj, tDHCPv4Params, NULL}, {"DHCPv6", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tDHCPv6Obj, tDHCPv6Params, NULL}, {"Hosts", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, thostsObj, thostsParam, NULL}, -{"NAT", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tnatObj, NULL, NULL}, +{"NAT", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tnatObj, tnatParam, NULL}, {"PPP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tpppObj, NULL, NULL}, {"Routing", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tRoutingObj, tRoutingParam, NULL}, {"UserInterface", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tUserInterfaceObj, NULL, NULL}, diff --git a/dm/dmtree/tr181/nat.c b/dm/dmtree/tr181/nat.c index bf8f74e..56a16df 100644 --- a/dm/dmtree/tr181/nat.c +++ b/dm/dmtree/tr181/nat.c @@ -4,7 +4,7 @@ * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * - * Copyright (C) 2018 Inteno Broadband Technology AB + * Copyright (C) 2019 iopsys Software Solutions AB * Author: Anis Ellouze * Author: Amin Ben Ramdhane * @@ -23,14 +23,40 @@ DMOBJ tnatObj[] = { /* OBJ, permission, addobj, delobj, checkobj, browseinstobj, finform, notification, nextobj, leaf*/ {"InterfaceSetting", &DMWRITE, add_NAT_InterfaceSetting, delete_NAT_InterfaceSetting, NULL, browseInterfaceSettingInst, NULL, NULL, NULL, tInterfaceSettingParam, NULL}, +{"PortMapping", &DMWRITE, add_NAT_PortMapping, delete_NAT_PortMapping, NULL, browsePortMappingInst, NULL, NULL, NULL, tPortMappingParam, NULL}, +{0} +}; + +DMLEAF tnatParam[] = { +{"InterfaceSettingNumberOfEntries", &DMREAD, DMT_UNINT, get_nat_interface_setting_number_of_entries, NULL, NULL, NULL}, +{"PortMappingNumberOfEntries", &DMREAD, DMT_UNINT, get_nat_port_mapping_number_of_entries, NULL, NULL, NULL}, {0} }; /*** NAT.InterfaceSetting. ***/ DMLEAF tInterfaceSettingParam[] = { -{"Enable", &DMWRITE, DMT_BOOL, get_nat_enable, set_nat_enable, NULL, NULL}, -{"Alias", &DMWRITE, DMT_STRING, get_nat_alias, set_nat_alias, NULL, NULL}, -{"Interface", &DMWRITE, DMT_STRING, get_nat_interface, set_nat_interface, NULL, NULL}, +{"Enable", &DMWRITE, DMT_BOOL, get_nat_interface_setting_enable, set_nat_interface_setting_enable, NULL, NULL}, +{"Status", &DMWRITE, DMT_STRING, get_nat_interface_setting_status, NULL, NULL, NULL}, +{"Alias", &DMWRITE, DMT_STRING, get_nat_interface_setting_alias, set_nat_interface_setting_alias, NULL, NULL}, +{"Interface", &DMWRITE, DMT_STRING, get_nat_interface_setting_interface, set_nat_interface_setting_interface, NULL, NULL}, +{0} +}; + +/*** NAT.PortMapping. ***/ +DMLEAF tPortMappingParam[] = { +{"Enable", &DMWRITE, DMT_BOOL, get_nat_port_mapping_enable, set_nat_port_mapping_enable, NULL, NULL}, +{"Status", &DMWRITE, DMT_STRING, get_nat_port_mapping_status, NULL, NULL, NULL}, +{"Alias", &DMWRITE, DMT_STRING, get_nat_port_mapping_alias, set_nat_port_mapping_alias, NULL, NULL}, +{"Interface", &DMWRITE, DMT_STRING, get_nat_port_mapping_interface, set_nat_port_mapping_interface, NULL, NULL}, +{"AllInterfaces", &DMWRITE, DMT_BOOL, get_nat_port_mapping_all_interface, set_nat_port_mapping_all_interface, NULL, NULL}, +{"LeaseDuration", &DMWRITE, DMT_UNINT, get_nat_port_mapping_lease_duration, set_nat_port_mapping_lease_duration, NULL, NULL}, +{"RemoteHost", &DMWRITE, DMT_STRING, get_nat_port_mapping_remote_host, set_nat_port_mapping_remote_host, NULL, NULL}, +{"ExternalPort", &DMWRITE, DMT_UNINT, get_nat_port_mapping_external_port, set_nat_port_mapping_external_port, NULL, NULL}, +{"ExternalPortEndRange", &DMWRITE, DMT_UNINT, get_nat_port_mapping_external_port_end_range, set_nat_port_mapping_external_port_end_range, NULL, NULL}, +{"InternalPort", &DMWRITE, DMT_UNINT, get_nat_port_mapping_internal_port, set_nat_port_mapping_internal_port, NULL, NULL}, +{"Protocol", &DMWRITE, DMT_STRING, get_nat_port_mapping_protocol, set_nat_port_mapping_protocol, NULL, NULL}, +{"InternalClient", &DMWRITE, DMT_STRING, get_nat_port_mapping_internal_client, set_nat_port_mapping_internal_client, NULL, NULL}, +{"Description", &DMWRITE, DMT_STRING, get_nat_port_mapping_description, set_nat_port_mapping_description, NULL, NULL}, {0} }; @@ -39,15 +65,12 @@ DMLEAF tInterfaceSettingParam[] = { /*************************************************************/ int add_NAT_InterfaceSetting(char *refparam, struct dmctx *ctx, void *data, char **instance) { - char *value, *v; - char name[8]; - char *inst; - struct uci_section *s = NULL; - struct uci_section *dmmap_firewall=NULL; + char *value, *v, *inst, name[16]; + struct uci_section *s = NULL, *dmmap_firewall = NULL; check_create_dmmap_package("dmmap_firewall"); - inst = get_last_instance_icwmpd("dmmap_firewall", "zone", "natinstance"); - sprintf(name, "NAT_%d", inst ? (atoi(inst)+1) : 1); + inst = get_last_instance_icwmpd("dmmap_firewall", "zone", "interface_setting_instance"); + sprintf(name, "iface_set_%d", inst ? (atoi(inst)+1) : 1); dmuci_add_section_and_rename("firewall", "zone", &s, &value); dmuci_set_value_by_section(s, "input", "REJECT"); dmuci_set_value_by_section(s, "output", "ACCEPT"); @@ -56,7 +79,7 @@ int add_NAT_InterfaceSetting(char *refparam, struct dmctx *ctx, void *data, char dmuci_add_section_icwmpd("dmmap_firewall", "zone", &dmmap_firewall, &v); dmuci_set_value_by_section(dmmap_firewall, "section_name", section_name(s)); - *instance = update_instance_icwmpd(dmmap_firewall, inst, "natinstance"); + *instance = update_instance_icwmpd(dmmap_firewall, inst, "interface_setting_instance"); return 0; } @@ -65,8 +88,7 @@ int delete_NAT_InterfaceSetting(char *refparam, struct dmctx *ctx, void *data, c { int found = 0; char *lan_name; - struct uci_section *s = NULL; - struct uci_section *ss = NULL, *dmmap_firewall= NULL; + struct uci_section *s = NULL, *ss = NULL, *dmmap_firewall= NULL; switch (del_action) { case DEL_INST: @@ -97,10 +119,92 @@ int delete_NAT_InterfaceSetting(char *refparam, struct dmctx *ctx, void *data, c return 0; } +int add_NAT_PortMapping(char *refparam, struct dmctx *ctx, void *data, char **instance) +{ + char *value, *v, *inst, name[16]; + struct uci_section *s = NULL, *dmmap_firewall = NULL; + + check_create_dmmap_package("dmmap_firewall"); + inst = get_last_instance_icwmpd("dmmap_firewall", "redirect", "port_mapping_instance"); + sprintf(name, "port_map_%d", inst ? (atoi(inst)+1) : 1); + dmuci_add_section_and_rename("firewall", "redirect", &s, &value); + dmuci_set_value_by_section(s, "name", name); + dmuci_set_value_by_section(s, "src", "wan"); + dmuci_set_value_by_section(s, "target", "DNAT"); + dmuci_set_value_by_section(s, "dest", "lan"); + + dmuci_add_section_icwmpd("dmmap_firewall", "redirect", &dmmap_firewall, &v); + dmuci_set_value_by_section(dmmap_firewall, "section_name", section_name(s)); + *instance = update_instance_icwmpd(dmmap_firewall, inst, "port_mapping_instance"); + return 0; + +} + +int delete_NAT_PortMapping(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action) +{ + int found = 0; + char *lan_name; + struct uci_section *s = NULL, *ss = NULL, *dmmap_firewall= NULL; + + switch (del_action) { + case DEL_INST: + get_dmmap_section_of_config_section("dmmap_firewall", "redirect", section_name((struct uci_section *)data), &dmmap_firewall); + if(dmmap_firewall != NULL) + dmuci_delete_by_section(dmmap_firewall, NULL, NULL); + dmuci_delete_by_section((struct uci_section *)data, NULL, NULL); + break; + case DEL_ALL: + uci_foreach_sections("firewall", "redirect", s) { + if (found != 0){ + get_dmmap_section_of_config_section("dmmap_firewall", "redirect", section_name(ss), &dmmap_firewall); + if(dmmap_firewall != NULL) + dmuci_delete_by_section(dmmap_firewall, NULL, NULL); + dmuci_delete_by_section(ss, NULL, NULL); + } + ss = s; + found++; + } + if (ss != NULL){ + get_dmmap_section_of_config_section("dmmap_firewall", "redirect", section_name(ss), &dmmap_firewall); + if(dmmap_firewall != NULL) + dmuci_delete_by_section(dmmap_firewall, NULL, NULL); + dmuci_delete_by_section(ss, NULL, NULL); + } + return 0; + } + return 0; +} + /************************************************************************** * SET & GET VALUE ***************************************************************************/ -int get_nat_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_nat_interface_setting_number_of_entries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + struct uci_section *s = NULL; + int cnt = 0; + + uci_foreach_sections("firewall", "zone", s) + { + cnt++; + } + dmasprintf(value, "%d", cnt); + return 0; +} + +int get_nat_port_mapping_number_of_entries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + struct uci_section *s = NULL; + int cnt = 0; + + uci_foreach_sections("firewall", "redirect", s) + { + cnt++; + } + dmasprintf(value, "%d", cnt); + return 0; +} + +int get_nat_interface_setting_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { char *val; dmuci_get_value_by_section_string((struct uci_section *)data, "masq", &val); @@ -108,7 +212,7 @@ int get_nat_enable(char *refparam, struct dmctx *ctx, void *data, char *instance return 0; } -int set_nat_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_nat_interface_setting_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; switch (action) { @@ -118,26 +222,30 @@ int set_nat_enable(char *refparam, struct dmctx *ctx, void *data, char *instance return 0; case VALUESET: string_to_bool(value, &b); - if (b) - dmuci_set_value_by_section((struct uci_section *)data, "masq", "1"); - else - dmuci_set_value_by_section((struct uci_section *)data, "masq", "0"); + dmuci_set_value_by_section((struct uci_section *)data, "masq", b ? "1" : "0"); return 0; } return 0; } +int get_nat_interface_setting_status(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + char *val; + dmuci_get_value_by_section_string((struct uci_section *)data, "masq", &val); + *value = (*val == '1') ? "Enabled" : "Disabled"; + return 0; +} -int get_nat_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_nat_interface_setting_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_section *dmmap_section; get_dmmap_section_of_config_section("dmmap_firewall", "zone", section_name((struct uci_section *)data), &dmmap_section); - dmuci_get_value_by_section_string(dmmap_section, "natalias", value); + dmuci_get_value_by_section_string(dmmap_section, "interface_setting_alias", value); return 0; } -int set_nat_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_nat_interface_setting_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { struct uci_section *dmmap_section; @@ -146,13 +254,13 @@ int set_nat_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, case VALUECHECK: return 0; case VALUESET: - dmuci_set_value_by_section(dmmap_section, "natalias", value); + dmuci_set_value_by_section(dmmap_section, "interface_setting_alias", value); return 0; } return 0; } -int get_nat_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_nat_interface_setting_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_list *v; struct uci_element *e; @@ -174,7 +282,7 @@ int get_nat_interface(char *refparam, struct dmctx *ctx, void *data, char *insta return 0; } -int set_nat_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_nat_interface_setting_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { char *iface, *pch, *pchr, buf[256] = ""; @@ -196,23 +304,364 @@ int set_nat_interface(char *refparam, struct dmctx *ctx, void *data, char *insta return 0; } +int get_nat_port_mapping_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + char *val; + dmuci_get_value_by_section_string((struct uci_section *)data, "enabled", &val); + *value = (*val == '1') ? "1" : "0"; + return 0; +} + +int set_nat_port_mapping_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + bool b; + switch (action) { + case VALUECHECK: + if (string_to_bool(value, &b)) + return FAULT_9007; + return 0; + case VALUESET: + string_to_bool(value, &b); + dmuci_set_value_by_section((struct uci_section *)data, "enabled", b ? "1" : "0"); + return 0; + } + return 0; +} + +int get_nat_port_mapping_status(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + char *val; + dmuci_get_value_by_section_string((struct uci_section *)data, "enabled", &val); + *value = (*val == '1') ? "Enabled" : "Disabled"; + return 0; +} + +int get_nat_port_mapping_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + struct uci_section *dmmap_section; + + get_dmmap_section_of_config_section("dmmap_firewall", "redirect", section_name((struct uci_section *)data), &dmmap_section); + dmuci_get_value_by_section_string(dmmap_section, "port_mapping_alias", value); + return 0; +} + +int set_nat_port_mapping_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + struct uci_section *dmmap_section; + + get_dmmap_section_of_config_section("dmmap_firewall", "redirect", section_name((struct uci_section *)data), &dmmap_section); + switch (action) { + case VALUECHECK: + return 0; + case VALUESET: + dmuci_set_value_by_section(dmmap_section, "port_mapping_alias", value); + return 0; + } + return 0; +} + +int get_nat_port_mapping_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + struct uci_section *s = NULL; + struct uci_list *v; + struct uci_element *e; + char *zone, *name, *ifaceobj, buf[256] = ""; + + dmuci_get_value_by_section_string((struct uci_section *)data, "src", &zone); + uci_foreach_sections("firewall", "zone", s) { + dmuci_get_value_by_section_string(s, "name", &name); + if (strcmp(zone, name) == 0) { + dmuci_get_value_by_section_list(s, "network", &v); + break; + } + } + if (v == NULL) + return 0; + uci_foreach_element(v, e) { + adm_entry_get_linker_param(ctx, dm_print_path("%s%cIP%cInterface%c", dmroot, dm_delim, dm_delim, dm_delim), e->name, &ifaceobj); // MEM WILL BE FREED IN DMMEMCLEAN + if (ifaceobj == NULL) + continue; + if (*buf != '\0') + strcat(buf, ","); + strcat(buf, ifaceobj); + } + *value = dmstrdup(buf); + return 0; +} + +int set_nat_port_mapping_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + char *iface, *network, *zone; + struct uci_section *s = NULL; + + switch (action) { + case VALUECHECK: + break; + case VALUESET: + adm_entry_get_linker_value(ctx, value, &iface); + if (iface[0] != '\0') { + uci_foreach_sections("firewall", "zone", s) + { + dmuci_get_value_by_section_string(s, "network", &network); + if (is_strword_in_optionvalue(network, iface)){ + dmuci_get_value_by_section_string(s, "name", &zone); + dmuci_set_value_by_section((struct uci_section *)data, "src", zone); + break; + } + } + } + break; + } + return 0; +} + +int get_nat_port_mapping_all_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + *value = "0"; + return 0; +} + +int set_nat_port_mapping_all_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + bool b; + switch (action) { + case VALUECHECK: + if (string_to_bool(value, &b)) + return FAULT_9007; + return 0; + case VALUESET: + return 0; + } + return 0; +} + +int get_nat_port_mapping_lease_duration(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + // CPE only supports static port forwards + *value = "0"; + return 0; +} + +int set_nat_port_mapping_lease_duration(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + switch (action) { + case VALUECHECK: + // CPE only supports static port forwards + if (strcmp(value, "0") != 0) + return FAULT_9007; + return 0; + case VALUESET: + // Nothing to set for static port forwards + return 0; + } + return 0; +} + +int get_nat_port_mapping_remote_host(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + dmuci_get_value_by_section_string((struct uci_section *)data, "src_dip", value); + return 0; +} + +int set_nat_port_mapping_remote_host(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + switch (action) { + case VALUECHECK: + return 0; + case VALUESET: + dmuci_set_value_by_section((struct uci_section *)data, "src_dip", value); + return 0; + } + return 0; +} + +int get_nat_port_mapping_external_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + char *dport, *tmp; + dmuci_get_value_by_section_string((struct uci_section *)data, "src_dport", &dport); + if (*dport == '\0') { + *value = "0"; + return 0; + } + tmp = strchr(dport, ':'); + if (tmp) + *tmp = '\0'; + *value = dport; + return 0; +} + +int set_nat_port_mapping_external_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + char *dport, buffer[64]; + switch (action) { + case VALUECHECK: + return 0; + case VALUESET: + dmuci_get_value_by_section_string((struct uci_section *)data, "src_dport", &dport); + dport = strchr(dport, ':'); + if (dport == NULL) + sprintf(buffer, "%s", value); + else + sprintf(buffer, "%s%s", value, dport); + dmuci_set_value_by_section((struct uci_section *)data, "src_dport", buffer); + return 0; + } + return 0; +} + +int get_nat_port_mapping_external_port_end_range(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + char *dport, *tmp; + dmuci_get_value_by_section_string((struct uci_section *)data, "src_dport", &dport); + tmp = strchr(dport, ':'); + *value = (tmp) ? tmp+1 : "0"; + return 0; +} + +int set_nat_port_mapping_external_port_end_range(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + char *dport, *tmp, buffer[64]; + switch (action) { + case VALUECHECK: + return 0; + case VALUESET: + dmuci_get_value_by_section_string((struct uci_section *)data, "src_dport", &dport); + tmp = strchr(dport, ':'); + if (tmp) + *tmp = '\0'; + if (*value == '0') + sprintf(buffer, "%s", dport); + else + sprintf(buffer, "%s:%s", dport, value); + dmuci_set_value_by_section((struct uci_section *)data, "src_dport", buffer); + return 0; + } + return 0; +} + +int get_nat_port_mapping_internal_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + dmuci_get_value_by_section_string((struct uci_section *)data, "dest_port", value); + return 0; +} + +int set_nat_port_mapping_internal_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + switch (action) { + case VALUECHECK: + return 0; + case VALUESET: + dmuci_set_value_by_section((struct uci_section *)data, "dest_port", value); + return 0; + } + return 0; +} + +int get_nat_port_mapping_protocol(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + char *proto; + dmuci_get_value_by_section_string((struct uci_section *)data, "proto", &proto); + if (strcasecmp(proto, "tcp") == 0) + *value = "TCP"; + else if (strcasecmp(proto, "udp") == 0) + *value = "UDP"; + else + *value = "TCP/UDP"; + return 0; + return 0; +} + +int set_nat_port_mapping_protocol(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + char *v; + switch (action) { + case VALUECHECK: + if (strcasecmp("TCP", value) != 0 && strcasecmp("UDP", value) != 0 && strcasecmp("TCP/UDP", value) != 0) + return FAULT_9007; + return 0; + case VALUESET: + if (strcasecmp("TCP", value) == 0) + v = "tcp"; + else if (strcasecmp("UDP", value) == 0) + v = "udp"; + else + v = "tcpudp"; + dmuci_set_value_by_section((struct uci_section *)data, "proto", v); + return 0; + } + return 0; +} + +int get_nat_port_mapping_internal_client(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + dmuci_get_value_by_section_string((struct uci_section *)data, "dest_ip", value); + return 0; +} + +int set_nat_port_mapping_internal_client(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + switch (action) { + case VALUECHECK: + return 0; + case VALUESET: + dmuci_set_value_by_section((struct uci_section *)data, "dest_ip", value); + return 0; + } + return 0; +} + +int get_nat_port_mapping_description(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +{ + dmuci_get_value_by_section_string((struct uci_section *)data, "name", value); + return 0; +} + +int set_nat_port_mapping_description(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +{ + switch (action) { + case VALUECHECK: + return 0; + case VALUESET: + dmuci_set_value_by_section((struct uci_section *)data, "name", value); + return 0; + } + return 0; +} + /************************************************************* * ENTRY METHOD /*************************************************************/ int browseInterfaceSettingInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance) { char *nati, *nati_last = NULL; - bool find_max = true; struct dmmap_dup *p; LIST_HEAD(dup_list); synchronize_specific_config_sections_with_dmmap("firewall", "zone", "dmmap_firewall", &dup_list); list_for_each_entry(p, &dup_list, list) { - nati = handle_update_instance(1, dmctx, &nati_last, update_instance_alias, 3, p->dmmap_section, "natinstance", "natalias"); + nati = handle_update_instance(1, dmctx, &nati_last, update_instance_alias, 3, p->dmmap_section, "interface_setting_instance", "interface_setting_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, nati) == DM_STOP) - return 0; + break; } free_dmmap_config_dup_list(&dup_list); return 0; } +int browsePortMappingInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance) +{ + char *natp, *natp_last = NULL, *target; + struct dmmap_dup *p; + LIST_HEAD(dup_list); + + synchronize_specific_config_sections_with_dmmap("firewall", "redirect", "dmmap_firewall", &dup_list); + list_for_each_entry(p, &dup_list, list) { + dmuci_get_value_by_section_string(p->config_section, "target", &target); + if (*target != '\0' && strcmp(target, "DNAT") != 0) + continue; + natp = handle_update_instance(1, dmctx, &natp_last, update_instance_alias, 3, p->dmmap_section, "port_mapping_instance", "port_mapping_alias"); + if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, natp) == DM_STOP) + break; + } + free_dmmap_config_dup_list(&dup_list); + return 0; +} diff --git a/dm/dmtree/tr181/nat.h b/dm/dmtree/tr181/nat.h index eb20f8c..8a0ab71 100644 --- a/dm/dmtree/tr181/nat.h +++ b/dm/dmtree/tr181/nat.h @@ -4,27 +4,62 @@ * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * - * Copyright (C) 2016 Inteno Broadband Technology AB + * Copyright (C) 2019 iopsys Software Solutions AB * Author: Imen BHIRI + * Author: Amin Ben Ramdhane * */ #ifndef __NAT_H #define __NAT_H -extern DMLEAF tInterfaceSettingParam[]; extern DMOBJ tnatObj[]; +extern DMLEAF tnatParam[]; +extern DMLEAF tInterfaceSettingParam[]; +extern DMLEAF tPortMappingParam[]; int browseInterfaceSettingInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance); +int browsePortMappingInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance); int add_NAT_InterfaceSetting(char *refparam, struct dmctx *ctx, void *data, char **instance); int delete_NAT_InterfaceSetting(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action); +int add_NAT_PortMapping(char *refparam, struct dmctx *ctx, void *data, char **instance); +int delete_NAT_PortMapping(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action); -int get_nat_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_nat_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_nat_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_nat_interface_setting_number_of_entries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_nat_port_mapping_number_of_entries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_nat_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_nat_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_nat_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_interface_setting_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_interface_setting_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_interface_setting_status(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_nat_interface_setting_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_interface_setting_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_interface_setting_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_interface_setting_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); + +int get_nat_port_mapping_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_status(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_nat_port_mapping_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_all_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_all_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_lease_duration(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_lease_duration(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_remote_host(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_remote_host(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_external_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_external_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_external_port_end_range(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_external_port_end_range(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_internal_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_internal_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_protocol(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_protocol(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_internal_client(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_internal_client(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_nat_port_mapping_description(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_nat_port_mapping_description(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); #endif