fix linker issue

This commit is contained in:
Anis Ellouze 2015-09-04 10:14:46 +01:00 committed by MOHAMED Kallel
parent 026576c919
commit f96f0bee4d
2 changed files with 5 additions and 4 deletions

View file

@ -2940,8 +2940,10 @@ inline int get_landevice_lanhostconfigmanagement_ipinterface (struct dmctx *ctx,
{
//ctx->args = (void *)args; //TO CHECK
struct ldipargs *ipargs = (struct ldipargs *)(ctx->args);
char linker[32] = "linker_interface:";
strcat(linker, section_name(ipargs->ldipsection));
DMOBJECT(DMROOT"LANDevice.%s.LANHostConfigManagement.IPInterface.%s.", ctx, "0", 1, NULL, NULL, section_name(ipargs->ldipsection), idev, ilan);//TO CHECK "linker_interface:$nlan"
DMOBJECT(DMROOT"LANDevice.%s.LANHostConfigManagement.IPInterface.%s.", ctx, "0", 1, NULL, NULL, linker, idev, ilan);
DMPARAM("Enable", ctx, "1", get_interface_enable_ubus, set_interface_enable_ubus, "xsd:boolean", 0, 0, UNDEF, NULL);
DMPARAM("X_BROADCOM_COM_FirewallEnabled", ctx, "1", get_interface_firewall_enabled, set_interface_firewall_enabled, NULL, 0, 0, UNDEF, NULL);
DMPARAM("IPInterfaceIPAddress", ctx, "1", get_interface_ipaddress, set_interface_ipaddress, NULL, 0, 0, UNDEF, NULL);

View file

@ -1173,9 +1173,9 @@ int get_wandevice_wanprotoclconnection_parameters(struct dmctx *ctx, char *idev,
bool notif_b = true;
bool forced_inform_eip = 0;
char *forced_notify= "";
char *linker;
char linker[32] = "linker_interface:";
char *lan_name = section_name(wandcprotoargs->wancprotosection);
dmastrcat(&linker, "linker_interface:", lan_name);
strcat(linker, lan_name);
if (strcmp(lan_name, default_wan) == 0) {
forced_inform_eip = 1;
forced_notify = "2"; //TODO fix that and should be int and not char
@ -1205,7 +1205,6 @@ int get_wandevice_wanprotoclconnection_parameters(struct dmctx *ctx, char *idev,
DMPARAM("Username", ctx, "1", get_wan_device_ppp_username, set_wan_device_username, NULL, 0, 0, UNDEF, NULL);
DMPARAM("Password", ctx, "1", get_empty, set_wan_device_password, NULL, 0, 0, UNDEF, NULL);
}
dmfree(linker);
return 0;
}