diff --git a/bin/Makefile.am b/bin/Makefile.am index a149b91..924727a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -19,15 +19,15 @@ libdatamodel_la_SOURCES = \ ../dm/dmtree/common/times.c \ ../dm/dmtree/common/upnp.c \ ../dm/dmtree/common/voice_services.c \ - ../dm/dmtree/common/x_inteno_se_ice.c \ - ../dm/dmtree/common/x_inteno_se_igmp.c \ - ../dm/dmtree/common/x_inteno_se_ipacccfg.c \ - ../dm/dmtree/common/x_inteno_se_logincfg.c \ - ../dm/dmtree/common/x_inteno_se_power_mgmt.c \ - ../dm/dmtree/common/x_inteno_syslog.c \ - ../dm/dmtree/common/x_inteno_se_dropbear.c \ - ../dm/dmtree/common/x_inteno_se_owsd.c \ - ../dm/dmtree/common/x_inteno_se_buttons.c \ + ../dm/dmtree/common/x_iopsys_eu_ice.c \ + ../dm/dmtree/common/x_iopsys_eu_igmp.c \ + ../dm/dmtree/common/x_iopsys_eu_ipacccfg.c \ + ../dm/dmtree/common/x_iopsys_eu_logincfg.c \ + ../dm/dmtree/common/x_iopsys_eu_power_mgmt.c \ + ../dm/dmtree/common/x_iopsys_eu_syslog.c \ + ../dm/dmtree/common/x_iopsys_eu_dropbear.c \ + ../dm/dmtree/common/x_iopsys_eu_owsd.c \ + ../dm/dmtree/common/x_iopsys_eu_buttons.c \ ../dm/dmtree/common/root.c if XMPP_ENABLE @@ -40,7 +40,7 @@ libdatamodel_la_SOURCES += \ ../dm/dmtree/tr098/landevice.c \ ../dm/dmtree/tr098/layer_2_bridging.c \ ../dm/dmtree/tr098/wandevice.c \ - ../dm/dmtree/tr098/x_inteno_se_wifi.c \ + ../dm/dmtree/tr098/x_iopsys_eu_wifi.c \ ../dm/dmtree/tr098/ippingdiagnostics.c \ ../dm/dmtree/tr098/downloaddiagnostic.c \ ../dm/dmtree/tr098/uploaddiagnostic.c \ diff --git a/dm/dmcwmp.c b/dm/dmcwmp.c index 9249f78..63f731e 100644 --- a/dm/dmcwmp.c +++ b/dm/dmcwmp.c @@ -22,18 +22,18 @@ #include "wandevice.h" #include "deviceinfo.h" #include "managementserver.h" -#include "x_inteno_se_igmp.h" -#include "x_inteno_se_wifi.h" -#include "x_inteno_se_ice.h" -#include "x_inteno_se_power_mgmt.h" -#include "x_inteno_se_ipacccfg.h" +#include "x_iopsys_eu_igmp.h" +#include "x_iopsys_eu_wifi.h" +#include "x_iopsys_eu_ice.h" +#include "x_iopsys_eu_power_mgmt.h" +#include "x_iopsys_eu_ipacccfg.h" #include "lan_interfaces.h" -#include "x_inteno_se_logincfg.h" +#include "x_iopsys_eu_logincfg.h" #include "voice_services.h" #include "layer_3_forwarding.h" #include "layer_2_bridging.h" #include "ippingdiagnostics.h" -#include "x_inteno_syslog.h" +#include "x_iopsys_eu_syslog.h" #include "dmentry.h" #include "dmcommon.h" #include "wifi.h" diff --git a/dm/dmtree/common/deviceinfo.c b/dm/dmtree/common/deviceinfo.c index 5323294..208559f 100644 --- a/dm/dmtree/common/deviceinfo.c +++ b/dm/dmtree/common/deviceinfo.c @@ -79,7 +79,7 @@ DMLEAF tDeviceInfoParams[] = { {0} }; -/*** DeviceInfo.X_INTENO_SE_CATV. ***/ +/*** DeviceInfo.X_IOPSYS_EU_CATV. ***/ DMLEAF tCatTvParams[] = { /* PARAM, permission, type, getvlue, setvalue, forced_inform, notification*/ {"Enabled", &DMWRITE, DMT_STRING, get_catv_enabled, set_device_catvenabled, NULL, NULL}, diff --git a/dm/dmtree/common/root.c b/dm/dmtree/common/root.c index f2388f8..3ca7bd8 100644 --- a/dm/dmtree/common/root.c +++ b/dm/dmtree/common/root.c @@ -17,17 +17,17 @@ #include "times.h" #include "upnp.h" #include "voice_services.h" -#include "x_inteno_se_ice.h" -#include "x_inteno_se_igmp.h" -#include "x_inteno_se_ipacccfg.h" -#include "x_inteno_se_logincfg.h" -#include "x_inteno_se_power_mgmt.h" -#include "x_inteno_syslog.h" +#include "x_iopsys_eu_ice.h" +#include "x_iopsys_eu_igmp.h" +#include "x_iopsys_eu_ipacccfg.h" +#include "x_iopsys_eu_logincfg.h" +#include "x_iopsys_eu_power_mgmt.h" +#include "x_iopsys_eu_syslog.h" #include "softwaremodules.h" #include "xmpp.h" -#include "x_inteno_se_owsd.h" -#include "x_inteno_se_dropbear.h" -#include "x_inteno_se_buttons.h" +#include "x_iopsys_eu_owsd.h" +#include "x_iopsys_eu_dropbear.h" +#include "x_iopsys_eu_buttons.h" #ifdef UPNP_TR064 #include "upnp_deviceinfo.h" #include "upnp_configuration.h" @@ -50,7 +50,7 @@ #include "ippingdiagnostics.h" #include "lan_interfaces.h" #include "layer_3_forwarding.h" -#include "x_inteno_se_wifi.h" +#include "x_iopsys_eu_wifi.h" #include "layer_2_bridging.h" #include "downloaddiagnostic.h" #include "uploaddiagnostic.h" @@ -83,9 +83,9 @@ DMOBJ tRoot_098_Obj[] = { {CUSTOM_PREFIX"PowerManagement", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_PowerManagementParam, NULL}, {CUSTOM_PREFIX"SyslogCfg", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_SyslogCfgParam, NULL}, {"SoftwareModules", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,tSoftwareModulesObj, NULL, NULL}, -{CUSTOM_PREFIX"Owsd", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,XIntenoSeOwsdObj, XIntenoSeOwsdParams, NULL}, -{CUSTOM_PREFIX"Dropbear", &DMWRITE, add_dropbear_instance, delete_dropbear_instance, NULL, browseXIntenoDropbear, NULL, &DMNONE, NULL, X_INTENO_SE_DropbearParams, NULL}, -{CUSTOM_PREFIX"Buttons", &DMREAD, NULL, NULL, NULL, browseXIntenoButton, NULL, &DMNONE, NULL, X_INTENO_SE_ButtonParams, NULL}, +{CUSTOM_PREFIX"Owsd", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,XIopsysEuOwsdObj, XIopsysEuOwsdParams, NULL}, +{CUSTOM_PREFIX"Dropbear", &DMWRITE, add_dropbear_instance, delete_dropbear_instance, NULL, browseXIopsysEuDropbear, NULL, &DMNONE, NULL, X_IOPSYS_EU_DropbearParams, NULL}, +{CUSTOM_PREFIX"Buttons", &DMREAD, NULL, NULL, NULL, browseXIopsysEuButton, NULL, &DMNONE, NULL, X_IOPSYS_EU_ButtonParams, NULL}, {"LANDevice", &DMREAD, NULL, NULL, NULL, browselandeviceInst, &DMFINFRM, &DMNONE,tLANDeviceObj, tLANDeviceParam, NULL}, {"WANDevice", &DMREAD, NULL, NULL, NULL, browsewandeviceInst, &DMFINFRM, &DMWANConnectionDevicenotif,tWANDeviceObj, tWANDeviceParam, NULL}, {"LANInterfaces", &DMREAD, NULL, NULL, check_laninterfaces, NULL, &DMFINFRM, &DMNONE,tLANInterfacesObj, tLANInterfacesParam, NULL}, @@ -116,9 +116,9 @@ DMOBJ tRoot_181_Obj[] = { {CUSTOM_PREFIX"PowerManagement", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_PowerManagementParam, NULL}, {CUSTOM_PREFIX"SyslogCfg", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_SyslogCfgParam, NULL}, {"SoftwareModules", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,tSoftwareModulesObj, NULL, NULL}, -{CUSTOM_PREFIX"Owsd", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,XIntenoSeOwsdObj, XIntenoSeOwsdParams, NULL}, -{CUSTOM_PREFIX"Dropbear", &DMWRITE, add_dropbear_instance, delete_dropbear_instance, NULL, browseXIntenoDropbear, NULL, &DMNONE, NULL, X_INTENO_SE_DropbearParams, NULL}, -{CUSTOM_PREFIX"Buttons", &DMREAD, NULL, NULL, NULL, browseXIntenoButton, NULL, &DMNONE, NULL, X_INTENO_SE_ButtonParams, NULL}, +{CUSTOM_PREFIX"Owsd", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,XIopsysEuOwsdObj, XIopsysEuOwsdParams, NULL}, +{CUSTOM_PREFIX"Dropbear", &DMWRITE, add_dropbear_instance, delete_dropbear_instance, NULL, browseXIopsysEuDropbear, NULL, &DMNONE, NULL, X_IOPSYS_EU_DropbearParams, NULL}, +{CUSTOM_PREFIX"Buttons", &DMREAD, NULL, NULL, NULL, browseXIopsysEuButton, NULL, &DMNONE, NULL, X_IOPSYS_EU_ButtonParams, NULL}, {"Bridging",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tBridgingObj, NULL, NULL}, {"WiFi",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tWifiObj, tWifiParams, NULL}, {"IP",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tIPObj, NULL, NULL}, @@ -179,9 +179,9 @@ DMOBJ tRoot098ObjUPNPBBF[] = { {CUSTOM_PREFIX"PowerManagement", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_PowerManagementParam, NULL}, {CUSTOM_PREFIX"SyslogCfg", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_SyslogCfgParam, NULL}, {"SoftwareModules", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,tSoftwareModulesObj, NULL, NULL}, -{CUSTOM_PREFIX"Owsd", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,XIntenoSeOwsdObj, XIntenoSeOwsdParams, NULL}, -{CUSTOM_PREFIX"Dropbear", &DMWRITE, add_dropbear_instance, delete_dropbear_instance, NULL, browseXIntenoDropbear, NULL, &DMNONE, NULL, X_INTENO_SE_DropbearParams, NULL}, -{CUSTOM_PREFIX"Buttons", &DMREAD, NULL, NULL, NULL, browseXIntenoButton, NULL, &DMNONE, NULL, X_INTENO_SE_ButtonParams, NULL}, +{CUSTOM_PREFIX"Owsd", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,XIopsysEuOwsdObj, XIopsysEuOwsdParams, NULL}, +{CUSTOM_PREFIX"Dropbear", &DMWRITE, add_dropbear_instance, delete_dropbear_instance, NULL, browseXIopsysEuDropbear, NULL, &DMNONE, NULL, X_IOPSYS_EU_DropbearParams, NULL}, +{CUSTOM_PREFIX"Buttons", &DMREAD, NULL, NULL, NULL, browseXIopsysEuButton, NULL, &DMNONE, NULL, X_IOPSYS_EU_ButtonParams, NULL}, {"LANDevice", &DMREAD, NULL, NULL, NULL, browselandeviceInst, &DMFINFRM, &DMNONE,tLANDeviceObj, tLANDeviceParam, NULL}, {"WANDevice", &DMREAD, NULL, NULL, NULL, browsewandeviceInst, &DMFINFRM, &DMWANConnectionDevicenotif,tWANDeviceObj, tWANDeviceParam, NULL}, {"LANInterfaces", &DMREAD, NULL, NULL, check_laninterfaces, NULL, &DMFINFRM, &DMNONE,tLANInterfacesObj, tLANInterfacesParam, NULL}, @@ -236,9 +236,9 @@ DMOBJ tRoot181ObjUPNPBBF[] = { {CUSTOM_PREFIX"PowerManagement", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_PowerManagementParam, NULL}, {CUSTOM_PREFIX"SyslogCfg", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_SyslogCfgParam, NULL}, {"SoftwareModules", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,tSoftwareModulesObj, NULL, NULL}, -{CUSTOM_PREFIX"Owsd", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,XIntenoSeOwsdObj, XIntenoSeOwsdParams, NULL}, -{CUSTOM_PREFIX"Dropbear", &DMWRITE, add_dropbear_instance, delete_dropbear_instance, NULL, browseXIntenoDropbear, NULL, &DMNONE, NULL, X_INTENO_SE_DropbearParams, NULL}, -{CUSTOM_PREFIX"Buttons", &DMREAD, NULL, NULL, NULL, browseXIntenoButton, NULL, &DMNONE, NULL, X_INTENO_SE_ButtonParams, NULL}, +{CUSTOM_PREFIX"Owsd", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,XIopsysEuOwsdObj, XIopsysEuOwsdParams, NULL}, +{CUSTOM_PREFIX"Dropbear", &DMWRITE, add_dropbear_instance, delete_dropbear_instance, NULL, browseXIopsysEuDropbear, NULL, &DMNONE, NULL, X_IOPSYS_EU_DropbearParams, NULL}, +{CUSTOM_PREFIX"Buttons", &DMREAD, NULL, NULL, NULL, browseXIopsysEuButton, NULL, &DMNONE, NULL, X_IOPSYS_EU_ButtonParams, NULL}, {"Bridging",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tBridgingObj, NULL, NULL}, {"WiFi",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tWifiObj, NULL, NULL}, {"IP",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tIPObj, NULL, NULL}, @@ -267,23 +267,23 @@ UPNP_SUPPORTED_DM tUPNPSupportedDM_098[] = { {"/BBF/Time/", DMROOT_URI_098, DMROOT_URL_098, "Time from "DMROOT_DESC_098, ""}, {"/BBF/UPnP/", DMROOT_URI_098, DMROOT_URL_098, "UPnP from "DMROOT_DESC_098, ""}, {"/BBF/VoiceService/", "urn:broadband-forum-org:wt-104-2-0-0", "https://www.broadband-forum.org/cwmp/tr-104-2-0-0.html", "TR-104 Voice:2 Service Object definition", ""}, -{"/BBF/X_INTENO_SE_ICE/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for ICE", ""}, -{"/BBF/X_INTENO_SE_IGMP/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for ICE", ""}, -{"/BBF/X_INTENO_SE_IpAccCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for IGMP", ""}, -{"/BBF/X_INTENO_SE_LoginCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for LoginCfg", ""}, -{"/BBF/X_INTENO_SE_PowerManagement/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for PowerManagement", ""}, -{"/BBF/X_INTENO_SE_SyslogCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for SyslogCfg", ""}, +{"/BBF/"CUSTOM_PREFIX"ICE/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for ICE", ""}, +{"/BBF/"CUSTOM_PREFIX"IGMP/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for ICE", ""}, +{"/BBF/"CUSTOM_PREFIX"IpAccCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for IGMP", ""}, +{"/BBF/"CUSTOM_PREFIX"LoginCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for LoginCfg", ""}, +{"/BBF/"CUSTOM_PREFIX"PowerManagement/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for PowerManagement", ""}, +{"/BBF/"CUSTOM_PREFIX"SyslogCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for SyslogCfg", ""}, {"/BBF/SoftwareModules/", DMROOT_URI_098, DMROOT_URL_098, "SoftwareModules from "DMROOT_DESC_098, ""}, -{"/BBF/X_INTENO_SE_Owsd/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Owsd", ""}, -{"/BBF/X_INTENO_SE_Dropbear/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Dropbear", ""}, -{"/BBF/X_INTENO_SE_Buttons/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Buttons", ""}, +{"/BBF/"CUSTOM_PREFIX"Owsd/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Owsd", ""}, +{"/BBF/"CUSTOM_PREFIX"Dropbear/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Dropbear", ""}, +{"/BBF/"CUSTOM_PREFIX"Buttons/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Buttons", ""}, {"/BBF/LANDevice/", DMROOT_URI_098, DMROOT_URL_098, "LANDevice from "DMROOT_DESC_098, ""}, {"/BBF/WANDevice/", DMROOT_URI_098, DMROOT_URL_098, "WANDevice from "DMROOT_DESC_098, ""}, {"/BBF/LANInterfaces/", DMROOT_URI_098, DMROOT_URL_098, "LANInterfaces from "DMROOT_DESC_098, ""}, {"/BBF/IPPingDiagnostics/", DMROOT_URI_098, DMROOT_URL_098, "IPPingDiagnostics from "DMROOT_DESC_098, ""}, {"/BBF/Layer3Forwarding/", DMROOT_URI_098, DMROOT_URL_098, "Layer3Forwarding from "DMROOT_DESC_098, ""}, {"/BBF/Layer2Bridging/", DMROOT_URI_098, DMROOT_URL_098, "Layer2Bridging from "DMROOT_DESC_098, ""}, -{"/BBF/X_INTENO_SE_Wifi/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for WiFi", ""}, +{"/BBF/"CUSTOM_PREFIX"Wifi/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for WiFi", ""}, {"/BBF/DownloadDiagnostics/", DMROOT_URI_098, DMROOT_URL_098, "DownloadDiagnostics from "DMROOT_DESC_098, ""}, {"/BBF/UploadDiagnostics/", DMROOT_URI_098, DMROOT_URL_098, "UploadDiagnostics from "DMROOT_DESC_098, ""}, #ifdef XMPP_ENABLE @@ -301,16 +301,16 @@ UPNP_SUPPORTED_DM tUPNPSupportedDM_181[] = { {"/BBF/Time/", DMROOT_URI_181, DMROOT_URL_181, "Time from "DMROOT_DESC_181, ""}, {"/BBF/UPnP/", DMROOT_URI_181, DMROOT_URL_181, "UPnP from "DMROOT_DESC_181, ""}, {"/BBF/VoiceService/", "urn:broadband-forum-org:wt-104-2-0-0", "https://www.broadband-forum.org/cwmp/tr-104-2-0-0.html", "TR-104 Voice:2 Service Object definition", ""}, -{"/BBF/X_INTENO_SE_ICE/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for ICE", ""}, -{"/BBF/X_INTENO_SE_IGMP/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for ICE", ""}, -{"/BBF/X_INTENO_SE_IpAccCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for IGMP", ""}, -{"/BBF/X_INTENO_SE_LoginCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for LoginCfg", ""}, -{"/BBF/X_INTENO_SE_PowerManagement/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for PowerManagement", ""}, -{"/BBF/X_INTENO_SE_SyslogCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for SyslogCfg", ""}, +{"/BBF/"CUSTOM_PREFIX"ICE/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for ICE", ""}, +{"/BBF/"CUSTOM_PREFIX"IGMP/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for ICE", ""}, +{"/BBF/"CUSTOM_PREFIX"IpAccCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for IGMP", ""}, +{"/BBF/"CUSTOM_PREFIX"LoginCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for LoginCfg", ""}, +{"/BBF/"CUSTOM_PREFIX"PowerManagement/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for PowerManagement", ""}, +{"/BBF/"CUSTOM_PREFIX"SyslogCfg/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for SyslogCfg", ""}, {"/BBF/SoftwareModules/", DMROOT_URI_181, DMROOT_URL_181, "SoftwareModules from "DMROOT_DESC_181, ""}, -{"/BBF/X_INTENO_SE_Owsd/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Owsd", ""}, -{"/BBF/X_INTENO_SE_Dropbear/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Dropbear", ""}, -{"/BBF/X_INTENO_SE_Buttons/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Buttons", ""}, +{"/BBF/"CUSTOM_PREFIX"Owsd/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Owsd", ""}, +{"/BBF/"CUSTOM_PREFIX"Dropbear/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Dropbear", ""}, +{"/BBF/"CUSTOM_PREFIX"Buttons/", "urn:intenogroup-com:na", "https://www.intenogroup.com/", "Inteno extension for Buttons", ""}, {"/BBF/Bridging/", DMROOT_URI_181, DMROOT_URL_181, "Bridging from "DMROOT_DESC_181, ""}, {"/BBF/WiFi/", DMROOT_URI_181, DMROOT_URL_181, "WiFi from "DMROOT_DESC_181, ""}, {"/BBF/IP/", DMROOT_URI_181, DMROOT_URL_181, "IP from "DMROOT_DESC_181, ""}, diff --git a/dm/dmtree/common/x_inteno_se_buttons.h b/dm/dmtree/common/x_inteno_se_buttons.h deleted file mode 100644 index be6d06d..0000000 --- a/dm/dmtree/common/x_inteno_se_buttons.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __SE_BUTTONS_H -#define __SE_BUTTONS_H - -extern DMLEAF X_INTENO_SE_ButtonParams[]; -int browseXIntenoButton(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance); -int get_x_inteno_button_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_button_hotplug(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_button_hotplug_long(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_button_minpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_button_minpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_button_longpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_button_longpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_button_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_button_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_button_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_button_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); - -#endif diff --git a/dm/dmtree/common/x_inteno_se_dropbear.h b/dm/dmtree/common/x_inteno_se_dropbear.h deleted file mode 100644 index b69074c..0000000 --- a/dm/dmtree/common/x_inteno_se_dropbear.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef __SE_DROPBEAR_H -#define __SE_DROPBEAR_H - -extern DMLEAF X_INTENO_SE_DropbearParams[]; -int browseXIntenoDropbear(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance); -int get_x_inteno_dropbear_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_root_login(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_root_login(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_rsakeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_rsakeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_dsskeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_dsskeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_banner_file(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_banner_file(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_dropbear_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_dropbear_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int add_dropbear_instance(char *refparam, struct dmctx *ctx, void *data, char **instancepara); -int delete_dropbear_instance(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action); - -#endif diff --git a/dm/dmtree/common/x_inteno_se_owsd.h b/dm/dmtree/common/x_inteno_se_owsd.h deleted file mode 100644 index 97bc23f..0000000 --- a/dm/dmtree/common/x_inteno_se_owsd.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef __SE_OWSD_H -#define __SE_OWSD_H - -int browseXIntenoOwsdListenObj(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance); - -int get_x_inteno_owsd_global_sock(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_global_sock(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_global_redirect(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_global_redirect(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_ubus_proxy_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_ubus_proxy_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_ubus_proxy_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_ubus_proxy_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_ubus_proxy_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_ubus_proxy_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_ubus_proxy_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_ubus_proxy_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int get_x_inteno_owsd_ubus_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int set_x_inteno_owsd_ubus_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); - -int add_owsd_listen(char *refparam, struct dmctx *ctx, void *data, char **instancepara); -int delete_owsd_listen_instance(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action); - -extern DMLEAF XIntenoSeOwsdParams[]; -extern DMOBJ XIntenoSeOwsdObj[]; -extern DMLEAF X_INTENO_SE_ListenObjParams[]; -extern DMLEAF UbusProxyParams[]; - -#endif diff --git a/dm/dmtree/common/x_inteno_se_buttons.c b/dm/dmtree/common/x_iopsys_eu_buttons.c similarity index 66% rename from dm/dmtree/common/x_inteno_se_buttons.c rename to dm/dmtree/common/x_iopsys_eu_buttons.c index 3f08417..eeb080a 100644 --- a/dm/dmtree/common/x_inteno_se_buttons.c +++ b/dm/dmtree/common/x_iopsys_eu_buttons.c @@ -17,22 +17,22 @@ #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" -#include "x_inteno_se_buttons.h" +#include "x_iopsys_eu_buttons.h" -/*** DMROOT.X_INTENO_SE_Buttons.{i}. ****/ -DMLEAF X_INTENO_SE_ButtonParams[] = { +/*** DMROOT.X_IOPSYS_EU_Buttons.{i}. ****/ +DMLEAF X_IOPSYS_EU_ButtonParams[] = { /* PARAM, permission, type, getvlue, setvalue, forced_inform, NOTIFICATION, linker*/ -{"Alias", &DMWRITE, DMT_STRING, get_x_inteno_button_alias, set_x_inteno_button_alias, NULL, NULL}, -{"button", &DMREAD, DMT_STRING, get_x_inteno_button_name, NULL, NULL, NULL}, -{"hotplug", &DMREAD, DMT_STRING, get_x_inteno_button_hotplug, NULL, NULL, NULL}, -{"hotplug_long", &DMREAD, DMT_STRING, get_x_inteno_button_hotplug_long, NULL, NULL, NULL}, -{"minpress", &DMWRITE, DMT_UNINT, get_x_inteno_button_minpress, set_x_inteno_button_minpress, NULL, NULL}, -{"longpress", &DMWRITE, DMT_UNINT, get_x_inteno_button_longpress, set_x_inteno_button_longpress, NULL, NULL}, -{"enable", &DMWRITE, DMT_BOOL, get_x_inteno_button_enable, set_x_inteno_button_enable, NULL, NULL}, +{"Alias", &DMWRITE, DMT_STRING, get_x_iopsys_eu_button_alias, set_x_iopsys_eu_button_alias, NULL, NULL}, +{"button", &DMREAD, DMT_STRING, get_x_iopsys_eu_button_name, NULL, NULL, NULL}, +{"hotplug", &DMREAD, DMT_STRING, get_x_iopsys_eu_button_hotplug, NULL, NULL, NULL}, +{"hotplug_long", &DMREAD, DMT_STRING, get_x_iopsys_eu_button_hotplug_long, NULL, NULL, NULL}, +{"minpress", &DMWRITE, DMT_UNINT, get_x_iopsys_eu_button_minpress, set_x_iopsys_eu_button_minpress, NULL, NULL}, +{"longpress", &DMWRITE, DMT_UNINT, get_x_iopsys_eu_button_longpress, set_x_iopsys_eu_button_longpress, NULL, NULL}, +{"enable", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_button_enable, set_x_iopsys_eu_button_enable, NULL, NULL}, {0} }; -int browseXIntenoButton(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance) +int browseXIopsysEuButton(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance) { char *ibutton = NULL, *ibutton_last = NULL; struct uci_section *s = NULL; @@ -53,7 +53,7 @@ int browseXIntenoButton(struct dmctx *dmctx, DMNODE *parent_node, void *prev_dat **** function related to button **** **************************************************************************************/ -int get_x_inteno_button_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_button_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_list *val; @@ -65,25 +65,25 @@ int get_x_inteno_button_name(char *refparam, struct dmctx *ctx, void *data, char return 0; } -int get_x_inteno_button_hotplug(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_button_hotplug(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "hotplug", value); return 0; } -int get_x_inteno_button_hotplug_long(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_button_hotplug_long(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "hotplug_long", value); return 0; } -int get_x_inteno_button_minpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_button_minpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "minpress", value); return 0; } -int set_x_inteno_button_minpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_button_minpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { @@ -96,13 +96,13 @@ int set_x_inteno_button_minpress(char *refparam, struct dmctx *ctx, void *data, return 0; } -int get_x_inteno_button_longpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_button_longpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "longpress", value); return 0; } -int set_x_inteno_button_longpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_button_longpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { @@ -116,7 +116,7 @@ int set_x_inteno_button_longpress(char *refparam, struct dmctx *ctx, void *data, } -int get_x_inteno_button_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_button_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "enable", value); if ((*value)[0] == '\0') { @@ -125,7 +125,7 @@ int get_x_inteno_button_enable(char *refparam, struct dmctx *ctx, void *data, ch return 0; } -int set_x_inteno_button_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_button_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; @@ -146,7 +146,7 @@ int set_x_inteno_button_enable(char *refparam, struct dmctx *ctx, void *data, ch } ////////////////////////SET AND GET ALIAS///////////////////////////////// -int get_x_inteno_button_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_button_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_section *dmmap_section; @@ -155,7 +155,7 @@ int get_x_inteno_button_alias(char *refparam, struct dmctx *ctx, void *data, cha return 0; } -int set_x_inteno_button_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_button_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { struct uci_section *dmmap_section; diff --git a/dm/dmtree/common/x_iopsys_eu_buttons.h b/dm/dmtree/common/x_iopsys_eu_buttons.h new file mode 100644 index 0000000..88dd899 --- /dev/null +++ b/dm/dmtree/common/x_iopsys_eu_buttons.h @@ -0,0 +1,18 @@ +#ifndef __SE_BUTTONS_H +#define __SE_BUTTONS_H + +extern DMLEAF X_IOPSYS_EU_ButtonParams[]; +int browseXIopsysEuButton(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance); +int get_x_iopsys_eu_button_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_button_hotplug(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_button_hotplug_long(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_button_minpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_button_minpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_button_longpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_button_longpress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_button_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_button_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_button_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_button_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); + +#endif diff --git a/dm/dmtree/common/x_inteno_se_dropbear.c b/dm/dmtree/common/x_iopsys_eu_dropbear.c similarity index 70% rename from dm/dmtree/common/x_inteno_se_dropbear.c rename to dm/dmtree/common/x_iopsys_eu_dropbear.c index be3b056..560e45d 100644 --- a/dm/dmtree/common/x_inteno_se_dropbear.c +++ b/dm/dmtree/common/x_iopsys_eu_dropbear.c @@ -16,28 +16,28 @@ #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" -#include "x_inteno_se_dropbear.h" +#include "x_iopsys_eu_dropbear.h" -/*** DMROOT.X_INTENO_SE_Dropbear.{i}. ****/ -DMLEAF X_INTENO_SE_DropbearParams[] = { +/*** DMROOT.X_IOPSYS_EU_Dropbear.{i}. ****/ +DMLEAF X_IOPSYS_EU_DropbearParams[] = { /* PARAM, permission, type, getvlue, setvalue, forced_inform, NOTIFICATION, linker*/ -{"Alias", &DMWRITE, DMT_STRING, get_x_inteno_dropbear_alias, set_x_inteno_dropbear_alias, NULL, NULL}, -{"PasswordAuth", &DMWRITE, DMT_BOOL, get_x_inteno_dropbear_password_auth, set_x_inteno_dropbear_password_auth, NULL, NULL}, -{"RootPasswordAuth", &DMWRITE, DMT_BOOL, get_x_inteno_dropbear_root_password_auth, set_x_inteno_dropbear_root_password_auth, NULL, NULL}, -{"Port", &DMWRITE, DMT_UNINT, get_x_inteno_dropbear_port, set_x_inteno_dropbear_port, NULL, NULL}, -{"RootLogin", &DMWRITE, DMT_BOOL, get_x_inteno_dropbear_root_login, set_x_inteno_dropbear_root_login, NULL, NULL}, -{"GatewayPorts", &DMWRITE, DMT_BOOL, get_x_inteno_dropbear_gateway_ports, set_x_inteno_dropbear_gateway_ports, NULL, NULL}, -{"Interface", &DMWRITE, DMT_STRING, get_x_inteno_dropbear_interface, set_x_inteno_dropbear_interface, NULL, NULL}, -{"rsakeyfile", &DMWRITE, DMT_STRING, get_x_inteno_dropbear_rsakeyfile, set_x_inteno_dropbear_rsakeyfile, NULL, NULL}, -{"dsskeyfile", &DMWRITE, DMT_STRING, get_x_inteno_dropbear_dsskeyfile, set_x_inteno_dropbear_dsskeyfile, NULL, NULL}, -{"SSHKeepAlive", &DMWRITE, DMT_UNINT, get_x_inteno_dropbear_ssh_keepalive, set_x_inteno_dropbear_ssh_keepalive, NULL, NULL}, -{"IdleTimeout", &DMWRITE, DMT_UNINT, get_x_inteno_dropbear_idle_timeout, set_x_inteno_dropbear_idle_timeout, NULL, NULL}, -{"verbose", &DMWRITE, DMT_BOOL, get_x_inteno_dropbear_verbose, set_x_inteno_dropbear_verbose, NULL, NULL}, -{"BannerFile", &DMWRITE, DMT_STRING, get_x_inteno_dropbear_banner_file, set_x_inteno_dropbear_banner_file, NULL, NULL}, +{"Alias", &DMWRITE, DMT_STRING, get_x_iopsys_eu_dropbear_alias, set_x_iopsys_eu_dropbear_alias, NULL, NULL}, +{"PasswordAuth", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_dropbear_password_auth, set_x_iopsys_eu_dropbear_password_auth, NULL, NULL}, +{"RootPasswordAuth", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_dropbear_root_password_auth, set_x_iopsys_eu_dropbear_root_password_auth, NULL, NULL}, +{"Port", &DMWRITE, DMT_UNINT, get_x_iopsys_eu_dropbear_port, set_x_iopsys_eu_dropbear_port, NULL, NULL}, +{"RootLogin", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_dropbear_root_login, set_x_iopsys_eu_dropbear_root_login, NULL, NULL}, +{"GatewayPorts", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_dropbear_gateway_ports, set_x_iopsys_eu_dropbear_gateway_ports, NULL, NULL}, +{"Interface", &DMWRITE, DMT_STRING, get_x_iopsys_eu_dropbear_interface, set_x_iopsys_eu_dropbear_interface, NULL, NULL}, +{"rsakeyfile", &DMWRITE, DMT_STRING, get_x_iopsys_eu_dropbear_rsakeyfile, set_x_iopsys_eu_dropbear_rsakeyfile, NULL, NULL}, +{"dsskeyfile", &DMWRITE, DMT_STRING, get_x_iopsys_eu_dropbear_dsskeyfile, set_x_iopsys_eu_dropbear_dsskeyfile, NULL, NULL}, +{"SSHKeepAlive", &DMWRITE, DMT_UNINT, get_x_iopsys_eu_dropbear_ssh_keepalive, set_x_iopsys_eu_dropbear_ssh_keepalive, NULL, NULL}, +{"IdleTimeout", &DMWRITE, DMT_UNINT, get_x_iopsys_eu_dropbear_idle_timeout, set_x_iopsys_eu_dropbear_idle_timeout, NULL, NULL}, +{"verbose", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_dropbear_verbose, set_x_iopsys_eu_dropbear_verbose, NULL, NULL}, +{"BannerFile", &DMWRITE, DMT_STRING, get_x_iopsys_eu_dropbear_banner_file, set_x_iopsys_eu_dropbear_banner_file, NULL, NULL}, {0} }; -int browseXIntenoDropbear(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance) +int browseXIopsysEuDropbear(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance) { char *idropbear = NULL, *idropbear_last = NULL; struct uci_section *s = NULL; @@ -58,7 +58,7 @@ int browseXIntenoDropbear(struct dmctx *dmctx, DMNODE *parent_node, void *prev_d **************************************************************************************/ -int get_x_inteno_dropbear_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "PasswordAuth", value); if ((*value)[0] == '\0' || ((*value)[0] == 'o' && (*value)[1] == 'n') || (*value)[0] == '1') { @@ -69,7 +69,7 @@ int get_x_inteno_dropbear_password_auth(char *refparam, struct dmctx *ctx, void return 0; } -int set_x_inteno_dropbear_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; @@ -89,7 +89,7 @@ int set_x_inteno_dropbear_password_auth(char *refparam, struct dmctx *ctx, void return 0; } -int get_x_inteno_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "RootPasswordAuth", value); if ((*value)[0] == '\0' || ((*value)[0] == 'o' && (*value)[1] == 'n') || (*value)[0] == '1') { @@ -100,7 +100,7 @@ int get_x_inteno_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, return 0; } -int set_x_inteno_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; @@ -120,7 +120,7 @@ int set_x_inteno_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, return 0; } -int get_x_inteno_dropbear_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "Port", value); if ((*value)[0] == '\0') { @@ -129,7 +129,7 @@ int get_x_inteno_dropbear_port(char *refparam, struct dmctx *ctx, void *data, ch return 0; } -int set_x_inteno_dropbear_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { @@ -145,7 +145,7 @@ int set_x_inteno_dropbear_port(char *refparam, struct dmctx *ctx, void *data, ch return 0; } -int get_x_inteno_dropbear_root_login(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_root_login(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "RootLogin", value); if ((*value)[0] == '\0' || ((*value)[0] == 'o' && (*value)[1] == 'n') || (*value)[0] == '1' ) { @@ -156,7 +156,7 @@ int get_x_inteno_dropbear_root_login(char *refparam, struct dmctx *ctx, void *da return 0; } -int set_x_inteno_dropbear_root_login(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_root_login(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; @@ -176,7 +176,7 @@ int set_x_inteno_dropbear_root_login(char *refparam, struct dmctx *ctx, void *da return 0; } -int get_x_inteno_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "verbose", value); if ((*value)[0] == '\0' || (*value)[0] == '0' ) { @@ -187,7 +187,7 @@ int get_x_inteno_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, return 0; } -int set_x_inteno_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; @@ -208,7 +208,7 @@ int set_x_inteno_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, } -int get_x_inteno_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "GatewayPorts", value); if ((*value)[0] == '\0' || (*value)[0] == '0' ) { @@ -219,7 +219,7 @@ int get_x_inteno_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void return 0; } -int set_x_inteno_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; @@ -239,13 +239,13 @@ int set_x_inteno_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void return 0; } -int get_x_inteno_dropbear_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "Interface", value); return 0; } -int set_x_inteno_dropbear_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { @@ -258,13 +258,13 @@ int set_x_inteno_dropbear_interface(char *refparam, struct dmctx *ctx, void *dat return 0; } -int get_x_inteno_dropbear_rsakeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_rsakeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "rsakeyfile", value); return 0; } -int set_x_inteno_dropbear_rsakeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_rsakeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { @@ -277,13 +277,13 @@ int set_x_inteno_dropbear_rsakeyfile(char *refparam, struct dmctx *ctx, void *da return 0; } -int get_x_inteno_dropbear_dsskeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_dsskeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "dsskeyfile", value); return 0; } -int set_x_inteno_dropbear_dsskeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_dsskeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { @@ -296,7 +296,7 @@ int set_x_inteno_dropbear_dsskeyfile(char *refparam, struct dmctx *ctx, void *da return 0; } -int get_x_inteno_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "SSHKeepAlive", value); if ((*value)[0] == '\0') { @@ -305,7 +305,7 @@ int get_x_inteno_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void return 0; } -int set_x_inteno_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { @@ -321,7 +321,7 @@ int set_x_inteno_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void return 0; } -int get_x_inteno_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "IdleTimeout", value); if ((*value)[0] == '\0') { @@ -330,7 +330,7 @@ int get_x_inteno_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void * return 0; } -int set_x_inteno_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { @@ -346,13 +346,13 @@ int set_x_inteno_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void * return 0; } -int get_x_inteno_dropbear_banner_file(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_banner_file(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_value_by_section_string((struct uci_section *)data, "BannerFile", value); return 0; } -int set_x_inteno_dropbear_banner_file(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_banner_file(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { @@ -367,7 +367,7 @@ int set_x_inteno_dropbear_banner_file(char *refparam, struct dmctx *ctx, void *d ////////////////////////SET AND GET ALIAS///////////////////////////////// -int get_x_inteno_dropbear_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_dropbear_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_section *dmmap_section; @@ -376,7 +376,7 @@ int get_x_inteno_dropbear_alias(char *refparam, struct dmctx *ctx, void *data, c return 0; } -int set_x_inteno_dropbear_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_dropbear_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { struct uci_section *dmmap_section; diff --git a/dm/dmtree/common/x_iopsys_eu_dropbear.h b/dm/dmtree/common/x_iopsys_eu_dropbear.h new file mode 100644 index 0000000..dab6500 --- /dev/null +++ b/dm/dmtree/common/x_iopsys_eu_dropbear.h @@ -0,0 +1,35 @@ +#ifndef __SE_DROPBEAR_H +#define __SE_DROPBEAR_H + +extern DMLEAF X_IOPSYS_EU_DropbearParams[]; +int browseXIopsysEuDropbear(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance); +int get_x_iopsys_eu_dropbear_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_root_password_auth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_root_login(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_root_login(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_verbose(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_gateway_ports(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_rsakeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_rsakeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_dsskeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_dsskeyfile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_ssh_keepalive(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_idle_timeout(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_banner_file(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_banner_file(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_dropbear_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_dropbear_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int add_dropbear_instance(char *refparam, struct dmctx *ctx, void *data, char **instancepara); +int delete_dropbear_instance(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action); + +#endif diff --git a/dm/dmtree/common/x_inteno_se_ice.c b/dm/dmtree/common/x_iopsys_eu_ice.c similarity index 96% rename from dm/dmtree/common/x_inteno_se_ice.c rename to dm/dmtree/common/x_iopsys_eu_ice.c index f5d2d81..88c965b 100644 --- a/dm/dmtree/common/x_inteno_se_ice.c +++ b/dm/dmtree/common/x_iopsys_eu_ice.c @@ -16,9 +16,9 @@ #include "dmubus.h" #include "dmcwmp.h" #include "dmcommon.h" -#include "x_inteno_se_ice.h" +#include "x_iopsys_eu_ice.h" -/*** DMROOT.X_INTENO_SE_ICE. ***/ +/*** DMROOT.X_IOPSYS_EU_ICE. ***/ DMLEAF tSe_IceParam[] = { {"Enable", &DMWRITE, DMT_BOOL, get_ice_cloud_enable, set_ice_cloud_enable, NULL, NULL}, {"Server", &DMWRITE, DMT_STRING, get_ice_cloud_server, set_ice_cloud_server, NULL, NULL}, diff --git a/dm/dmtree/common/x_inteno_se_ice.h b/dm/dmtree/common/x_iopsys_eu_ice.h similarity index 100% rename from dm/dmtree/common/x_inteno_se_ice.h rename to dm/dmtree/common/x_iopsys_eu_ice.h diff --git a/dm/dmtree/common/x_inteno_se_igmp.c b/dm/dmtree/common/x_iopsys_eu_igmp.c similarity index 99% rename from dm/dmtree/common/x_inteno_se_igmp.c rename to dm/dmtree/common/x_iopsys_eu_igmp.c index 07100bb..fc8b2e3 100644 --- a/dm/dmtree/common/x_inteno_se_igmp.c +++ b/dm/dmtree/common/x_iopsys_eu_igmp.c @@ -16,7 +16,7 @@ #include "dmubus.h" #include "dmcwmp.h" #include "dmcommon.h" -#include "x_inteno_se_igmp.h" +#include "x_iopsys_eu_igmp.h" int get_igmp_dscp_mark(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) diff --git a/dm/dmtree/common/x_inteno_se_igmp.h b/dm/dmtree/common/x_iopsys_eu_igmp.h similarity index 100% rename from dm/dmtree/common/x_inteno_se_igmp.h rename to dm/dmtree/common/x_iopsys_eu_igmp.h diff --git a/dm/dmtree/common/x_inteno_se_ipacccfg.c b/dm/dmtree/common/x_iopsys_eu_ipacccfg.c similarity index 96% rename from dm/dmtree/common/x_inteno_se_ipacccfg.c rename to dm/dmtree/common/x_iopsys_eu_ipacccfg.c index 3d5dcac..503c86a 100644 --- a/dm/dmtree/common/x_inteno_se_ipacccfg.c +++ b/dm/dmtree/common/x_iopsys_eu_ipacccfg.c @@ -17,9 +17,9 @@ #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" -#include "x_inteno_se_ipacccfg.h" +#include "x_iopsys_eu_ipacccfg.h" -/*** DMROOT.X_INTENO_SE_IpAccCfg. ***/ +/*** DMROOT.X_IOPSYS_EU_IpAccCfg. ***/ DMOBJ tSe_IpAccObj[] = { /* OBJ, permission, addobj, delobj, browseinstobj, finform, notification, nextobj, leaf*/ {CUSTOM_PREFIX"IpAccListCfgObj", &DMWRITE, add_ipacccfg_rule, delete_ipacccfg_rule, NULL, browseAccListInst, NULL, NULL, NULL, tSe_IpAccCfgParam, NULL}, @@ -46,12 +46,12 @@ DMLEAF tSe_PortForwardingParam[] = { }; DMLEAF tSe_IpAccCfgParam[] = { -{"Alias", &DMWRITE, DMT_STRING, get_x_inteno_cfgobj_address_alias, set_x_inteno_cfgobj_address_alias, NULL, NULL}, +{"Alias", &DMWRITE, DMT_STRING, get_x_iopsys_eu_cfgobj_address_alias, set_x_iopsys_eu_cfgobj_address_alias, NULL, NULL}, {"Enable", &DMWRITE, DMT_BOOL, get_x_bcm_com_ip_acc_list_cfgobj_enable, set_x_bcm_com_ip_acc_list_cfgobj_enable, NULL, NULL}, {"IPVersion", &DMWRITE, DMT_STRING, get_x_bcm_com_ip_acc_list_cfgobj_ipversion, set_x_bcm_com_ip_acc_list_cfgobj_ipversion, NULL, NULL}, {"Protocol", &DMWRITE, DMT_STRING, get_x_bcm_com_ip_acc_list_cfgobj_protocol, set_x_bcm_com_ip_acc_list_cfgobj_protocol, NULL, NULL}, {"FilterName", &DMWRITE, DMT_STRING, get_x_bcm_com_ip_acc_list_cfgobj_name, set_x_bcm_com_ip_acc_list_cfgobj_name, NULL, NULL}, -{"AccAddressAndNetMask", &DMWRITE, DMT_STRING, get_x_inteno_cfgobj_address_netmask, set_x_inteno_cfgobj_address_netmask, NULL, NULL}, +{"AccAddressAndNetMask", &DMWRITE, DMT_STRING, get_x_iopsys_eu_cfgobj_address_netmask, set_x_iopsys_eu_cfgobj_address_netmask, NULL, NULL}, {"AccPort", &DMWRITE, DMT_STRING, get_x_bcm_com_ip_acc_list_cfgobj_acc_port, set_x_bcm_com_ip_acc_list_cfgobj_acc_port, NULL, NULL}, {"Target", &DMWRITE, DMT_STRING, get_x_bcm_com_ip_acc_list_cfgobj_target, set_x_bcm_com_ip_acc_list_cfgobj_target, NULL, NULL}, {0} @@ -165,7 +165,7 @@ int set_x_bcm_com_ip_acc_list_cfgobj_name(char *refparam, struct dmctx *ctx, voi return 0; } -int get_x_inteno_cfgobj_address_netmask(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_cfgobj_address_netmask(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_list *val; struct uci_element *e = NULL; @@ -185,7 +185,7 @@ int get_x_inteno_cfgobj_address_netmask(char *refparam, struct dmctx *ctx, void return 0; } -int set_x_inteno_cfgobj_address_netmask(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_cfgobj_address_netmask(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { char *pch, *spch, *val; struct uci_section *ipaccsection = (struct uci_section *)data; @@ -742,7 +742,7 @@ int delete_ipacccfg_port_forwarding(char *refparam, struct dmctx *ctx, void *dat } ////////////////////////SET AND GET ALIAS///////////////////////////////// -int get_x_inteno_cfgobj_address_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_cfgobj_address_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_section *ipaccsection = (struct uci_section *)data; struct uci_section *dmmap_section; @@ -752,7 +752,7 @@ int get_x_inteno_cfgobj_address_alias(char *refparam, struct dmctx *ctx, void *d return 0; } -int set_x_inteno_cfgobj_address_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_cfgobj_address_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { struct uci_section *ipaccsection = (struct uci_section *)data; struct uci_section *dmmap_section; diff --git a/dm/dmtree/common/x_inteno_se_ipacccfg.h b/dm/dmtree/common/x_iopsys_eu_ipacccfg.h similarity index 91% rename from dm/dmtree/common/x_inteno_se_ipacccfg.h rename to dm/dmtree/common/x_iopsys_eu_ipacccfg.h index 1c78d1f..d49ac4e 100644 --- a/dm/dmtree/common/x_inteno_se_ipacccfg.h +++ b/dm/dmtree/common/x_iopsys_eu_ipacccfg.h @@ -29,12 +29,12 @@ int get_port_forwarding_internal_ipaddress(char *refparam, struct dmctx *ctx, vo int get_port_forwarding_external_ipaddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_port_forwarding_source_ipaddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_port_forwarding_src_mac(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_cfgobj_address_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_cfgobj_address_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_x_bcm_com_ip_acc_list_cfgobj_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_x_bcm_com_ip_acc_list_cfgobj_ipversion(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_x_bcm_com_ip_acc_list_cfgobj_protocol(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_x_bcm_com_ip_acc_list_cfgobj_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_cfgobj_address_netmask(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_cfgobj_address_netmask(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_x_bcm_com_ip_acc_list_cfgobj_acc_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_x_bcm_com_ip_acc_list_cfgobj_target(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); @@ -52,12 +52,12 @@ int set_port_forwarding_internal_ipaddress(char *refparam, struct dmctx *ctx, vo int set_port_forwarding_external_ipaddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_port_forwarding_source_ipaddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_port_forwarding_src_mac(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_x_inteno_cfgobj_address_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_x_iopsys_eu_cfgobj_address_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_x_bcm_com_ip_acc_list_cfgobj_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_x_bcm_com_ip_acc_list_cfgobj_ipversion(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_x_bcm_com_ip_acc_list_cfgobj_protocol(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_x_bcm_com_ip_acc_list_cfgobj_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_x_inteno_cfgobj_address_netmask(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_x_iopsys_eu_cfgobj_address_netmask(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_x_bcm_com_ip_acc_list_cfgobj_acc_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_x_bcm_com_ip_acc_list_cfgobj_target(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); diff --git a/dm/dmtree/common/x_inteno_se_logincfg.c b/dm/dmtree/common/x_iopsys_eu_logincfg.c similarity index 96% rename from dm/dmtree/common/x_inteno_se_logincfg.c rename to dm/dmtree/common/x_iopsys_eu_logincfg.c index 4a9a234..26fa36f 100644 --- a/dm/dmtree/common/x_inteno_se_logincfg.c +++ b/dm/dmtree/common/x_iopsys_eu_logincfg.c @@ -14,9 +14,9 @@ #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" -#include "x_inteno_se_logincfg.h" +#include "x_iopsys_eu_logincfg.h" -/*** DMROOT.X_INTENO_SE_LoginCfg. ***/ +/*** DMROOT.X_IOPSYS_EU_LoginCfg. ***/ DMLEAF tSe_LoginCfgParam[] = { {"AdminPassword", &DMWRITE, DMT_STRING, get_empty, set_x_bcm_admin_password, NULL, NULL}, {"SupportPassword", &DMWRITE, DMT_STRING, get_empty, set_x_bcm_support_password, NULL, NULL}, diff --git a/dm/dmtree/common/x_inteno_se_logincfg.h b/dm/dmtree/common/x_iopsys_eu_logincfg.h similarity index 100% rename from dm/dmtree/common/x_inteno_se_logincfg.h rename to dm/dmtree/common/x_iopsys_eu_logincfg.h diff --git a/dm/dmtree/common/x_inteno_se_owsd.c b/dm/dmtree/common/x_iopsys_eu_owsd.c similarity index 71% rename from dm/dmtree/common/x_inteno_se_owsd.c rename to dm/dmtree/common/x_iopsys_eu_owsd.c index 4373016..b68bffc 100644 --- a/dm/dmtree/common/x_inteno_se_owsd.c +++ b/dm/dmtree/common/x_iopsys_eu_owsd.c @@ -18,49 +18,49 @@ #include "dmubus.h" #include "dmcommon.h" #include "dmentry.h" -#include "x_inteno_se_owsd.h" +#include "x_iopsys_eu_owsd.h" -/*** DMROOT.X_INTENO_SE_Owsd. ***/ -DMLEAF XIntenoSeOwsdParams[] = { +/*** DMROOT.X_IOPSYS_EU_Owsd. ***/ +DMLEAF XIopsysEuOwsdParams[] = { /* PARAM, permission, type, getvlue, setvalue, forced_inform, NOTIFICATION, linker*/ -{"Socket", &DMWRITE, DMT_STRING, get_x_inteno_owsd_global_sock, set_x_inteno_owsd_global_sock, NULL, NULL}, -{"Redirect", &DMWRITE, DMT_STRING, get_x_inteno_owsd_global_redirect, set_x_inteno_owsd_global_redirect, NULL, NULL}, +{"Socket", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_global_sock, set_x_iopsys_eu_owsd_global_sock, NULL, NULL}, +{"Redirect", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_global_redirect, set_x_iopsys_eu_owsd_global_redirect, NULL, NULL}, {0} }; -DMOBJ XIntenoSeOwsdObj[] = { +DMOBJ XIopsysEuOwsdObj[] = { /* OBJ, permission, addobj, delobj, browseinstobj, finform, nextobj, leaf*/ {CUSTOM_PREFIX"UbusProxy", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, UbusProxyParams, NULL}, -{CUSTOM_PREFIX"ListenObj", &DMWRITE, add_owsd_listen, delete_owsd_listen_instance, NULL, browseXIntenoOwsdListenObj, NULL, NULL, NULL, X_INTENO_SE_ListenObjParams, NULL}, +{CUSTOM_PREFIX"ListenObj", &DMWRITE, add_owsd_listen, delete_owsd_listen_instance, NULL, browseXIopsysEuOwsdListenObj, NULL, NULL, NULL, X_IOPSYS_EU_ListenObjParams, NULL}, {0} }; DMLEAF UbusProxyParams[] = { /* PARAM, permission, type, getvlue, setvalue, forced_inform, NOTIFICATION, linker*/ -{"Enable", &DMWRITE, DMT_BOOL, get_x_inteno_owsd_ubus_proxy_enable, set_x_inteno_owsd_ubus_proxy_enable, NULL, NULL}, -{"UbusProxyCert", &DMWRITE, DMT_STRING, get_x_inteno_owsd_ubus_proxy_cert, set_x_inteno_owsd_ubus_proxy_cert, NULL, NULL}, -{"UbusProxyKey", &DMWRITE, DMT_STRING, get_x_inteno_owsd_ubus_proxy_key, set_x_inteno_owsd_ubus_proxy_key, NULL, NULL}, -{"UbusProxyCa", &DMWRITE, DMT_STRING, get_x_inteno_owsd_ubus_proxy_ca, set_x_inteno_owsd_ubus_proxy_ca, NULL, NULL}, +{"Enable", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_owsd_ubus_proxy_enable, set_x_iopsys_eu_owsd_ubus_proxy_enable, NULL, NULL}, +{"UbusProxyCert", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_ubus_proxy_cert, set_x_iopsys_eu_owsd_ubus_proxy_cert, NULL, NULL}, +{"UbusProxyKey", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_ubus_proxy_key, set_x_iopsys_eu_owsd_ubus_proxy_key, NULL, NULL}, +{"UbusProxyCa", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_ubus_proxy_ca, set_x_iopsys_eu_owsd_ubus_proxy_ca, NULL, NULL}, {0} }; -DMLEAF X_INTENO_SE_ListenObjParams[] = { +DMLEAF X_IOPSYS_EU_ListenObjParams[] = { /* PARAM, permission, type, getvlue, setvalue, forced_inform, NOTIFICATION, linker*/ -{"Alias", &DMWRITE, DMT_STRING, get_x_inteno_owsd_listenobj_alias, set_x_inteno_owsd_listenobj_alias, NULL, NULL}, -{"Port", &DMWRITE, DMT_UNINT, get_x_inteno_owsd_listenobj_port, set_x_inteno_owsd_listenobj_port, NULL, NULL}, -{"Interface", &DMWRITE, DMT_STRING, get_x_inteno_owsd_listenobj_interface, set_x_inteno_owsd_listenobj_interface, NULL, NULL}, -{"Ipv6", &DMWRITE, DMT_BOOL, get_x_inteno_owsd_listenobj_ipv6_enable, set_x_inteno_owsd_listenobj_ipv6_enable, NULL, NULL}, -{"Whitelist_interface", &DMWRITE, DMT_BOOL, get_x_inteno_owsd_listenobj_whitelist_interface, set_x_inteno_owsd_listenobj_whitelist_interface, NULL, NULL}, -{"Whitelist_dhcp", &DMWRITE, DMT_BOOL, get_x_inteno_owsd_listenobj_whitelist_dhcp, set_x_inteno_owsd_listenobj_whitelist_dhcp, NULL, NULL}, -{"Origin", &DMWRITE, DMT_STRING, get_x_inteno_owsd_listenobj_origin, set_x_inteno_owsd_listenobj_origin, NULL, NULL}, -{"UbusCert", &DMWRITE, DMT_STRING, get_x_inteno_owsd_ubus_cert, set_x_inteno_owsd_ubus_cert, NULL, NULL}, -{"UbusKey", &DMWRITE, DMT_STRING, get_x_inteno_owsd_ubus_key, set_x_inteno_owsd_ubus_key, NULL, NULL}, -{"UbusCa", &DMWRITE, DMT_STRING, get_x_inteno_owsd_ubus_ca, set_x_inteno_owsd_ubus_ca, NULL, NULL}, +{"Alias", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_listenobj_alias, set_x_iopsys_eu_owsd_listenobj_alias, NULL, NULL}, +{"Port", &DMWRITE, DMT_UNINT, get_x_iopsys_eu_owsd_listenobj_port, set_x_iopsys_eu_owsd_listenobj_port, NULL, NULL}, +{"Interface", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_listenobj_interface, set_x_iopsys_eu_owsd_listenobj_interface, NULL, NULL}, +{"Ipv6", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_owsd_listenobj_ipv6_enable, set_x_iopsys_eu_owsd_listenobj_ipv6_enable, NULL, NULL}, +{"Whitelist_interface", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_owsd_listenobj_whitelist_interface, set_x_iopsys_eu_owsd_listenobj_whitelist_interface, NULL, NULL}, +{"Whitelist_dhcp", &DMWRITE, DMT_BOOL, get_x_iopsys_eu_owsd_listenobj_whitelist_dhcp, set_x_iopsys_eu_owsd_listenobj_whitelist_dhcp, NULL, NULL}, +{"Origin", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_listenobj_origin, set_x_iopsys_eu_owsd_listenobj_origin, NULL, NULL}, +{"UbusCert", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_ubus_cert, set_x_iopsys_eu_owsd_ubus_cert, NULL, NULL}, +{"UbusKey", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_ubus_key, set_x_iopsys_eu_owsd_ubus_key, NULL, NULL}, +{"UbusCa", &DMWRITE, DMT_STRING, get_x_iopsys_eu_owsd_ubus_ca, set_x_iopsys_eu_owsd_ubus_ca, NULL, NULL}, {0} }; -int browseXIntenoOwsdListenObj(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance) +int browseXIopsysEuOwsdListenObj(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance) { char *iowsd_listen = NULL, *iowsd_listen_last = NULL; struct uci_section *s = NULL; @@ -80,13 +80,13 @@ int browseXIntenoOwsdListenObj(struct dmctx *dmctx, DMNODE *parent_node, void *p /************************************************************************************* **** function related to owsd_origin **** **************************************************************************************/ -int get_x_inteno_owsd_global_sock(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_owsd_global_sock(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_option_value_string("owsd", "global", "sock", value); return 0; } -int set_x_inteno_owsd_global_sock(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_owsd_global_sock(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { case VALUECHECK: @@ -98,13 +98,13 @@ int set_x_inteno_owsd_global_sock(char *refparam, struct dmctx *ctx, void *data, return 0; } -int get_x_inteno_owsd_global_redirect(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_owsd_global_redirect(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { dmuci_get_option_value_string("owsd", "global", "redirect", value); return 0; } -int set_x_inteno_owsd_global_redirect(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_owsd_global_redirect(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { switch (action) { case VALUECHECK: @@ -120,7 +120,7 @@ int set_x_inteno_owsd_global_redirect(char *refparam, struct dmctx *ctx, void *d **** function related to owsd_listenobj **** **************************************************************************************/ -int get_x_inteno_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_section *owsd_listensection = (struct uci_section *)data; dmuci_get_value_by_section_string(owsd_listensection, "port", value); @@ -130,7 +130,7 @@ int get_x_inteno_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *da return 0; } -int set_x_inteno_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { struct uci_section *owsd_listensection = (struct uci_section *)data; @@ -144,7 +144,7 @@ int set_x_inteno_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *da return 0; } -int get_x_inteno_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { char *iface, *linker; char *uci_datamodel = NULL; @@ -176,7 +176,7 @@ int get_x_inteno_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, voi return 0; } -int set_x_inteno_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { int check; char *linker, *iface; @@ -203,7 +203,7 @@ int set_x_inteno_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, voi return 0; } -int get_x_inteno_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_section *owsd_listensection = (struct uci_section *)data; @@ -216,7 +216,7 @@ int get_x_inteno_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, v return 0; } -int set_x_inteno_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; struct uci_section *owsd_listensection = (struct uci_section *)data; @@ -237,7 +237,7 @@ int set_x_inteno_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, v return 0; } -int get_x_inteno_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_section *owsd_listensection = (struct uci_section *)data; dmuci_get_value_by_section_string(owsd_listensection, "whitelist_interface_as_origin", value); @@ -247,7 +247,7 @@ int get_x_inteno_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx return 0; } -int set_x_inteno_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; struct uci_section *owsd_listensection = (struct uci_section *)data; @@ -268,7 +268,7 @@ int set_x_inteno_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx return 0; } -int get_x_inteno_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_section *owsd_listensection = (struct uci_section *)data; dmuci_get_value_by_section_string(owsd_listensection, "whitelist_dhcp_domains", value); @@ -278,7 +278,7 @@ int get_x_inteno_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx return 0; } -int set_x_inteno_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { bool b; struct uci_section *owsd_listensection = (struct uci_section *)data; @@ -299,7 +299,7 @@ int set_x_inteno_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx return 0; } -int get_x_inteno_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_list *val; struct uci_section *owsd_listensection = (struct uci_section *)data; @@ -312,7 +312,7 @@ int get_x_inteno_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void * return 0; } -int set_x_inteno_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { char *pch, *spch; struct uci_section *owsd_listensection = (struct uci_section *)data; @@ -334,7 +334,7 @@ int set_x_inteno_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void * } ////////////////////////SET AND GET ALIAS///////////////////////////////// -int get_x_inteno_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct uci_section *owsd_listensection = (struct uci_section *)data; struct uci_section *dmmap_section; @@ -344,7 +344,7 @@ int get_x_inteno_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *d return 0; } -int set_x_inteno_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { struct uci_section *owsd_listensection = (struct uci_section *)data; struct uci_section *dmmap_section; @@ -360,12 +360,12 @@ int set_x_inteno_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *d return 0; } -int get_x_inteno_owsd_ubus_proxy_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ +int get_x_iopsys_eu_owsd_ubus_proxy_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ dmuci_get_option_value_string("owsd","ubusproxy","enable", value); return 0; } -int set_x_inteno_owsd_ubus_proxy_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ +int set_x_iopsys_eu_owsd_ubus_proxy_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ switch (action) { case VALUECHECK: return 0; @@ -376,12 +376,12 @@ int set_x_inteno_owsd_ubus_proxy_enable(char *refparam, struct dmctx *ctx, void return 0; } -int get_x_inteno_owsd_ubus_proxy_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ +int get_x_iopsys_eu_owsd_ubus_proxy_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ dmuci_get_option_value_string("owsd","ubusproxy","peer_cert", value); return 0; } -int set_x_inteno_owsd_ubus_proxy_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ +int set_x_iopsys_eu_owsd_ubus_proxy_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ switch (action) { case VALUECHECK: return 0; @@ -391,12 +391,12 @@ int set_x_inteno_owsd_ubus_proxy_cert(char *refparam, struct dmctx *ctx, void *d } } -int get_x_inteno_owsd_ubus_proxy_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ +int get_x_iopsys_eu_owsd_ubus_proxy_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ dmuci_get_option_value_string("owsd","ubusproxy","peer_key", value); return 0; } -int set_x_inteno_owsd_ubus_proxy_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ +int set_x_iopsys_eu_owsd_ubus_proxy_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ char *net_cur_mode= NULL; switch (action) { @@ -409,12 +409,12 @@ int set_x_inteno_owsd_ubus_proxy_key(char *refparam, struct dmctx *ctx, void *da return 0; } -int get_x_inteno_owsd_ubus_proxy_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ +int get_x_iopsys_eu_owsd_ubus_proxy_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ dmuci_get_option_value_string("owsd","ubusproxy","peer_ca", value); return 0; } -int set_x_inteno_owsd_ubus_proxy_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ +int set_x_iopsys_eu_owsd_ubus_proxy_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ char *net_cur_mode= NULL; switch (action) { @@ -427,7 +427,7 @@ int set_x_inteno_owsd_ubus_proxy_ca(char *refparam, struct dmctx *ctx, void *dat return 0; } -int get_x_inteno_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ +int get_x_iopsys_eu_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ struct uci_section *owsd_listensection = (struct uci_section *)data; char *net_cur_mode= NULL; dmuci_get_option_value_string("netmode", "setup", "curmode", &net_cur_mode); @@ -438,7 +438,7 @@ int get_x_inteno_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, c return 0; } -int set_x_inteno_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ +int set_x_iopsys_eu_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ struct uci_section *owsd_listensection = (struct uci_section *)data; char *net_cur_mode= NULL; @@ -456,7 +456,7 @@ int set_x_inteno_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, c return 0; } -int get_x_inteno_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ +int get_x_iopsys_eu_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ struct uci_section *owsd_listensection = (struct uci_section *)data; char *net_cur_mode= NULL; @@ -467,7 +467,7 @@ int get_x_inteno_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, ch return 0; } -int set_x_inteno_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ +int set_x_iopsys_eu_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ struct uci_section *owsd_listensection = (struct uci_section *)data; char *net_cur_mode= NULL; @@ -485,7 +485,7 @@ int set_x_inteno_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, ch return 0; } -int get_x_inteno_owsd_ubus_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ +int get_x_iopsys_eu_owsd_ubus_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value){ struct uci_section *owsd_listensection = (struct uci_section *)data; char *net_cur_mode= NULL; @@ -496,7 +496,7 @@ int get_x_inteno_owsd_ubus_ca(char *refparam, struct dmctx *ctx, void *data, cha return 0; } -int set_x_inteno_owsd_ubus_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ +int set_x_iopsys_eu_owsd_ubus_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action){ struct uci_section *owsd_listensection = (struct uci_section *)data; char *net_cur_mode= NULL; diff --git a/dm/dmtree/common/x_iopsys_eu_owsd.h b/dm/dmtree/common/x_iopsys_eu_owsd.h new file mode 100644 index 0000000..102f4a4 --- /dev/null +++ b/dm/dmtree/common/x_iopsys_eu_owsd.h @@ -0,0 +1,47 @@ +#ifndef __SE_OWSD_H +#define __SE_OWSD_H + +int browseXIopsysEuOwsdListenObj(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance); + +int get_x_iopsys_eu_owsd_global_sock(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_global_sock(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_global_redirect(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_global_redirect(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_listenobj_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_listenobj_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_listenobj_ipv6_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_listenobj_whitelist_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_listenobj_whitelist_dhcp(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_listenobj_origin(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_listenobj_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_ubus_proxy_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_ubus_proxy_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_ubus_proxy_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_ubus_proxy_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_ubus_proxy_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_ubus_proxy_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_ubus_proxy_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_ubus_proxy_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_ubus_cert(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_ubus_key(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int get_x_iopsys_eu_owsd_ubus_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int set_x_iopsys_eu_owsd_ubus_ca(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); + +int add_owsd_listen(char *refparam, struct dmctx *ctx, void *data, char **instancepara); +int delete_owsd_listen_instance(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action); + +extern DMLEAF XIopsysEuOwsdParams[]; +extern DMOBJ XIopsysEuOwsdObj[]; +extern DMLEAF X_IOPSYS_EU_ListenObjParams[]; +extern DMLEAF UbusProxyParams[]; + +#endif diff --git a/dm/dmtree/common/x_inteno_se_power_mgmt.c b/dm/dmtree/common/x_iopsys_eu_power_mgmt.c similarity index 97% rename from dm/dmtree/common/x_inteno_se_power_mgmt.c rename to dm/dmtree/common/x_iopsys_eu_power_mgmt.c index 1325b07..4c168a1 100644 --- a/dm/dmtree/common/x_inteno_se_power_mgmt.c +++ b/dm/dmtree/common/x_iopsys_eu_power_mgmt.c @@ -15,9 +15,9 @@ #include "dmcwmp.h" #include "dmuci.h" #include "dmcommon.h" -#include "x_inteno_se_power_mgmt.h" +#include "x_iopsys_eu_power_mgmt.h" -/*** DMROOT.X_INTENO_SE_PowerManagement. ***/ +/*** DMROOT.X_IOPSYS_EU_PowerManagement. ***/ DMLEAF tSe_PowerManagementParam[] = { {"EthernetAutoPowerDownEnable", &DMWRITE, DMT_BOOL, get_pwr_mgmt_value_ethapd, set_power_mgmt_param_ethapd, NULL, NULL}, {"EnergyEfficientEthernetEnable", &DMWRITE, DMT_BOOL, get_pwr_mgmt_value_eee, set_power_mgmt_param_eee, NULL, NULL}, diff --git a/dm/dmtree/common/x_inteno_se_power_mgmt.h b/dm/dmtree/common/x_iopsys_eu_power_mgmt.h similarity index 100% rename from dm/dmtree/common/x_inteno_se_power_mgmt.h rename to dm/dmtree/common/x_iopsys_eu_power_mgmt.h diff --git a/dm/dmtree/common/x_inteno_syslog.c b/dm/dmtree/common/x_iopsys_eu_syslog.c similarity index 97% rename from dm/dmtree/common/x_inteno_syslog.c rename to dm/dmtree/common/x_iopsys_eu_syslog.c index bce9edf..aded962 100644 --- a/dm/dmtree/common/x_inteno_syslog.c +++ b/dm/dmtree/common/x_iopsys_eu_syslog.c @@ -16,9 +16,9 @@ #include "dmubus.h" #include "dmcwmp.h" #include "dmcommon.h" -#include "x_inteno_syslog.h" +#include "x_iopsys_eu_syslog.h" -/*** DMROOT.X_INTENO_SE_SyslogCfg. ***/ +/*** DMROOT.X_IOPSYS_EU_SyslogCfg. ***/ DMLEAF tSe_SyslogCfgParam[] = { {"ServerIPAddress", &DMWRITE, DMT_STRING, get_server_ip_address, set_server_ip_address, NULL, NULL}, {"ServerPortNumber", &DMWRITE, DMT_UNINT, get_server_port_number, set_server_port_number, NULL, NULL}, diff --git a/dm/dmtree/common/x_inteno_syslog.h b/dm/dmtree/common/x_iopsys_eu_syslog.h similarity index 100% rename from dm/dmtree/common/x_inteno_syslog.h rename to dm/dmtree/common/x_iopsys_eu_syslog.h diff --git a/dm/dmtree/tr098/lan_interfaces.c b/dm/dmtree/tr098/lan_interfaces.c index 6b916ee..44931c0 100644 --- a/dm/dmtree/tr098/lan_interfaces.c +++ b/dm/dmtree/tr098/lan_interfaces.c @@ -35,7 +35,7 @@ DMLEAF tLANInterfacesParam[] = { /*** LANInterfaces.LANEthernetInterfaceConfig. ***/ DMLEAF tlaninterface_lanParam[] = { {"Alias", &DMWRITE, DMT_STRING, get_lan_eth_int_alias, set_lan_eth_int_alias, NULL, NULL}, -{"X_INTENO_COM_EthName", &DMREAD, DMT_STRING, get_eth_name, NULL, NULL, NULL}, +{CUSTOM_PREFIX"EthName", &DMREAD, DMT_STRING, get_eth_name, NULL, NULL, NULL}, {0} }; diff --git a/dm/dmtree/tr098/landevice.c b/dm/dmtree/tr098/landevice.c index 5de8f86..5fc3b49 100644 --- a/dm/dmtree/tr098/landevice.c +++ b/dm/dmtree/tr098/landevice.c @@ -111,7 +111,7 @@ DMLEAF tDHCPConditionalServingPoolParam[] = { {"Alias", &DMWRITE, DMT_STRING, get_dhcp_conditional_servingpool_alias, set_dhcp_conditional_servingpool_alias, NULL, &DMNONE}, {"Enable", &DMWRITE, DMT_BOOL, get_dhcp_conditional_servingpool_enable, set_dhcp_conditionalservingpool_enable, NULL, &DMNONE}, {"VendorClassID", &DMWRITE, DMT_STRING, get_dhcp_conditional_servingpool_vendorclassid, set_dhcp_conditional_servingpool_vendorclassid, NULL, &DMNONE}, -{"X_INTENO_COM_Networkid", &DMWRITE, DMT_STRING, get_dhcp_conditional_servingpool_network_id, set_dhcp_conditional_servingpool_network_id, NULL, &DMNONE}, +{CUSTOM_PREFIX"Networkid", &DMWRITE, DMT_STRING, get_dhcp_conditional_servingpool_network_id, set_dhcp_conditional_servingpool_network_id, NULL, &DMNONE}, {0} }; @@ -200,12 +200,12 @@ DMLEAF tWlanConfigurationParam[] = { {"TotalPacketsReceived", &DMREAD, DMT_UNINT, get_wlan_devstatus_statistics_rx_packets, NULL, NULL, NULL}, {"SSIDAdvertisementEnabled", &DMWRITE, DMT_BOOL, get_wlan_ssid_advertisement_enable, set_wlan_ssid_advertisement_enable, NULL, NULL}, {"WMMEnable", &DMWRITE, DMT_BOOL, get_wmm_enabled, set_wmm_enabled, NULL, NULL}, -{CUSTOM_PREFIX"ChannelMode", &DMWRITE, DMT_STRING, get_x_inteno_se_channelmode, set_x_inteno_se_channelmode, NULL, NULL}, -{CUSTOM_PREFIX"SupportedStandards", &DMREAD, DMT_STRING, get_x_inteno_se_supported_standard, NULL, NULL, NULL}, -{CUSTOM_PREFIX"OperatingChannelBandwidth", &DMWRITE, DMT_STRING, get_x_inteno_se_operating_channel_bandwidth, set_x_inteno_se_operating_channel_bandwidth, NULL, NULL}, -{CUSTOM_PREFIX"MaxSSID", &DMWRITE, DMT_STRING, get_x_inteno_se_maxssid, set_x_inteno_se_maxssid, NULL, NULL}, -{CUSTOM_PREFIX"ScanTimer", &DMWRITE, DMT_STRING, get_x_inteno_se_scantimer, set_x_inteno_se_scantimer, NULL, NULL}, -{CUSTOM_PREFIX"Frequency", &DMWRITE, DMT_STRING, get_x_inteno_se_frequency, set_x_inteno_se_frequency, NULL, NULL}, +{CUSTOM_PREFIX"ChannelMode", &DMWRITE, DMT_STRING, get_x_iopsys_eu_channelmode, set_x_iopsys_eu_channelmode, NULL, NULL}, +{CUSTOM_PREFIX"SupportedStandards", &DMREAD, DMT_STRING, get_x_iopsys_eu_supported_standard, NULL, NULL, NULL}, +{CUSTOM_PREFIX"OperatingChannelBandwidth", &DMWRITE, DMT_STRING, get_x_iopsys_eu_operating_channel_bandwidth, set_x_iopsys_eu_operating_channel_bandwidth, NULL, NULL}, +{CUSTOM_PREFIX"MaxSSID", &DMWRITE, DMT_STRING, get_x_iopsys_eu_maxssid, set_x_iopsys_eu_maxssid, NULL, NULL}, +{CUSTOM_PREFIX"ScanTimer", &DMWRITE, DMT_STRING, get_x_iopsys_eu_scantimer, set_x_iopsys_eu_scantimer, NULL, NULL}, +{CUSTOM_PREFIX"Frequency", &DMWRITE, DMT_STRING, get_x_iopsys_eu_frequency, set_x_iopsys_eu_frequency, NULL, NULL}, {0} }; @@ -680,7 +680,7 @@ int add_landevice_wlanconfiguration(char *refparam, struct dmctx *ctx, void *dat check_create_dmmap_package("dmmap_wireless"); instance = get_last_instance_lev2_icwmpd("wireless", "wifi-iface", "dmmap_wireless", "lwlaninstance", "network", lan_name); - sprintf(ssid, "Inteno_%s_%d", lan_name, instance ? (atoi(instance)+1) : 1); + sprintf(ssid, "Iopsys_%s_%d", lan_name, instance ? (atoi(instance)+1) : 1); dmuci_add_section_and_rename("wireless", "wifi-iface", &s, &value); get_wifi_device_name(&wifi_dev_name); dmuci_set_value_by_section(s, "device", wifi_dev_name); @@ -2184,7 +2184,7 @@ int set_wlan_beacon_type(char *refparam, struct dmctx *ctx, void *data, char *in if (strcmp(encryption, "wep-shared") != 0 && strcmp(encryption, "wep-open") != 0) { reset_wlan(wlanargs->lwlansection); dmuci_set_value_by_section(wlanargs->lwlansection, "key", "1"); - wepkey64("Inteno", strk64); + wepkey64("Iopsys", strk64); int i = 0; while (i < 4) { dmasprintf(&option, "key%d", i + 1); @@ -2348,7 +2348,7 @@ int set_wlan_wep_key_index(char *refparam, struct dmctx *ctx, void *data, char * { reset_wlan(wlanargs->lwlansection); dmuci_set_value_by_section(wlanargs->lwlansection, "encryption", "wep-open"); - wepkey64("Inteno", strk64); + wepkey64("Iopsys", strk64); int i = 0; while (i < 4) { dmasprintf(&option, "key%d", i + 1); @@ -2374,7 +2374,7 @@ int set_wlan_key_passphrase(char *refparam, struct dmctx *ctx, void *data, char case VALUESET: dmuci_get_value_by_section_string(wlanargs->lwlansection, "encryption", &encryption); if (strcmp(encryption, "wep-shared") == 0 || strcmp(encryption, "wep-open") == 0) { - wepkey64("Inteno", strk64); + wepkey64("Iopsys", strk64); int i = 0; while (i < 4) { dmasprintf(&option, "key%d", i + 1); @@ -2427,7 +2427,7 @@ int set_wlan_basic_encryption_modes(char *refparam, struct dmctx *ctx, void *dat reset_wlan(wlanargs->lwlansection); dmuci_set_value_by_section(wlanargs->lwlansection, "key", "1"); int i = 0; - wepkey64("Inteno", strk64); + wepkey64("Iopsys", strk64); while (i < 4) { dmasprintf(&option, "key%d", i + 1); dmuci_set_value_by_section(wlanargs->lwlansection, option, strk64[i]); @@ -2473,7 +2473,7 @@ int set_wlan_basic_authentication_mode(char *refparam, struct dmctx *ctx, void * reset_wlan(wlanargs->lwlansection); dmuci_set_value_by_section(wlanargs->lwlansection, "key", "1"); int i = 0; - wepkey64("Inteno", strk64); + wepkey64("Iopsys", strk64); while (i < 4) { dmasprintf(&option, "key%d", i + 1); dmuci_set_value_by_section(wlanargs->lwlansection, option, strk64[i]); @@ -2941,7 +2941,7 @@ int set_wlan_wps_enable(char *refparam, struct dmctx *ctx, void *data, char *ins return 0; } -int get_x_inteno_se_channelmode(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_channelmode(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; dmuci_get_value_by_section_string(wlanargs->device_section, "channel", value); @@ -2952,7 +2952,7 @@ int get_x_inteno_se_channelmode(char *refparam, struct dmctx *ctx, void *data, c return 0; } -int set_x_inteno_se_channelmode(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_channelmode(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { char *channel; struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; @@ -2975,7 +2975,7 @@ int set_x_inteno_se_channelmode(char *refparam, struct dmctx *ctx, void *data, c return 0; } -int get_x_inteno_se_supported_standard(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_supported_standard(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { char *freq; struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; @@ -2989,7 +2989,7 @@ int get_x_inteno_se_supported_standard(char *refparam, struct dmctx *ctx, void * return 0; } -int get_x_inteno_se_operating_channel_bandwidth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_operating_channel_bandwidth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { char *bandwith; struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; @@ -3004,7 +3004,7 @@ int get_x_inteno_se_operating_channel_bandwidth(char *refparam, struct dmctx *ct return 0; } -int set_x_inteno_se_operating_channel_bandwidth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_operating_channel_bandwidth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { char *pch, *spch, *dup; struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; @@ -3022,7 +3022,7 @@ int set_x_inteno_se_operating_channel_bandwidth(char *refparam, struct dmctx *ct return 0; } -int get_x_inteno_se_maxssid(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_maxssid(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; @@ -3030,7 +3030,7 @@ int get_x_inteno_se_maxssid(char *refparam, struct dmctx *ctx, void *data, char return 0; } -int set_x_inteno_se_maxssid(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_maxssid(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; @@ -3059,7 +3059,7 @@ int set_wlan_wep_key(char *refparam, struct dmctx *ctx, void *data, char *instan if (strcmp(encryption, "wep-shared") != 0 && strcmp(encryption, "wep-open") != 0) { reset_wlan(wepargs->lwlansection); dmuci_set_value_by_section(wepargs->lwlansection, "encryption", "wep-open"); - wepkey64("Inteno", strk64); + wepkey64("Iopsys", strk64); int i = 0; while (i < 4) { dmasprintf(&option, "key%d", i + 1); @@ -3169,7 +3169,7 @@ int set_wlan_preshared_key_passphrase(char *refparam, struct dmctx *ctx, void *d case VALUESET: dmuci_get_value_by_section_string(pskargs->lwlansection, "encryption", &encryption); if (strcmp(encryption, "wep-shared") == 0 || strcmp(encryption, "wep-open") == 0) { - wepkey64("Inteno", strk64); + wepkey64("Iopsys", strk64); int i = 0; while (i < 4) { dmasprintf(&option, "key%d", i + 1); @@ -3205,7 +3205,7 @@ int get_wlan_psk_assoc_MACAddress(char *refparam, struct dmctx *ctx, void *data, return 0; } -int get_x_inteno_se_scantimer(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_scantimer(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; *value = "0"; @@ -3213,7 +3213,7 @@ int get_x_inteno_se_scantimer(char *refparam, struct dmctx *ctx, void *data, cha return 0; } -int set_x_inteno_se_scantimer(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_scantimer(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; @@ -3242,7 +3242,7 @@ static int get_wmm_enabled(char *refparam, struct dmctx *ctx, void *data, char * return 0; } -int get_x_inteno_se_frequency(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_x_iopsys_eu_frequency(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { char *freq; struct ldwlanargs *wlanargs = (struct ldwlanargs *)data; @@ -3253,7 +3253,7 @@ int get_x_inteno_se_frequency(char *refparam, struct dmctx *ctx, void *data, cha return 0; } -int set_x_inteno_se_frequency(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_x_iopsys_eu_frequency(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { char *freq = NULL; json_object *res = NULL; diff --git a/dm/dmtree/tr098/landevice.h b/dm/dmtree/tr098/landevice.h index 6168f07..82b62f8 100644 --- a/dm/dmtree/tr098/landevice.h +++ b/dm/dmtree/tr098/landevice.h @@ -196,12 +196,12 @@ int get_wlan_devstatus_statistics_tx_packets(char *refparam, struct dmctx *ctx, int get_wlan_devstatus_statistics_rx_packets(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); static int get_wlan_ssid_advertisement_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); static int get_wmm_enabled(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_se_channelmode(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_se_supported_standard(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_se_operating_channel_bandwidth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_se_maxssid(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_se_scantimer(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_x_inteno_se_frequency(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_channelmode(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_supported_standard(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_operating_channel_bandwidth(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_maxssid(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_scantimer(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_x_iopsys_eu_frequency(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_wlan_wps_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_wlan_wep_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_wlan_psk_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); @@ -263,11 +263,11 @@ int set_wlan_device_operation_mode(char *refparam, struct dmctx *ctx, void *data int set_wlan_authentication_service_mode(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); static int set_wlan_ssid_advertisement_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); static int set_wmm_enabled(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_x_inteno_se_channelmode(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_x_inteno_se_operating_channel_bandwidth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_x_inteno_se_maxssid(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_x_inteno_se_scantimer(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_x_inteno_se_frequency(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_x_iopsys_eu_channelmode(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_x_iopsys_eu_operating_channel_bandwidth(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_x_iopsys_eu_maxssid(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_x_iopsys_eu_scantimer(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_x_iopsys_eu_frequency(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_wlan_wps_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_wlan_wep_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_wlan_wep_key1(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); diff --git a/dm/dmtree/tr098/layer_2_bridging.c b/dm/dmtree/tr098/layer_2_bridging.c index 4006142..3a55d9b 100644 --- a/dm/dmtree/tr098/layer_2_bridging.c +++ b/dm/dmtree/tr098/layer_2_bridging.c @@ -70,7 +70,7 @@ DMLEAF tlayer2_bridgeParam[] = { {"BridgeKey", &DMREAD, DMT_UNINT, get_bridge_key, NULL, NULL, NULL}, {"BridgeName", &DMWRITE, DMT_STRING, get_bridge_name, set_bridge_name, NULL, NULL}, {"VLANID", &DMWRITE, DMT_UNINT, get_bridge_vlanid, set_bridge_vlanid, NULL, NULL}, -{"X_INTENO_COM_AssociatedInterfaces", &DMWRITE, DMT_STRING, get_associated_interfaces, set_associated_interfaces, NULL, NULL}, +{CUSTOM_PREFIX"AssociatedInterfaces", &DMWRITE, DMT_STRING, get_associated_interfaces, set_associated_interfaces, NULL, NULL}, {0} }; diff --git a/dm/dmtree/tr098/wandevice.c b/dm/dmtree/tr098/wandevice.c index 563de32..3f68b35 100644 --- a/dm/dmtree/tr098/wandevice.c +++ b/dm/dmtree/tr098/wandevice.c @@ -61,7 +61,7 @@ DMOBJ tWANConnectionObj[] = { /* OBJ, permission, addobj, delobj, browseinstobj, finform, notification, nextobj, leaf*/ //dynamic {"Stats", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tWANConnectionStatsParam, NULL}, -{"X_INTENO_COM_VLAN", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tWANConnection_VLANParam, NULL}, +{CUSTOM_PREFIX"VLAN", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tWANConnection_VLANParam, NULL}, {0} }; @@ -104,8 +104,8 @@ DMLEAF tWANConnectionStatsParam[] = { {0} }; -/*** WANDevice.{i}.WANConnectionDevice.{i}.WANIPConnection.{i}.X_INTENO_COM_VLAN. ***/ -/*** WANDevice.{i}.WANConnectionDevice.{i}.WANPPPConnection.{i}.X_INTENO_COM_VLAN. ***/ +/*** WANDevice.{i}.WANConnectionDevice.{i}.WANIPConnection.{i}.X_IOPSYS_EU_VLAN. ***/ +/*** WANDevice.{i}.WANConnectionDevice.{i}.WANPPPConnection.{i}.X_IOPSYS_EU_VLAN. ***/ DMLEAF tWANConnection_VLANParam[] = { {"VLANID", &DMWRITE, DMT_UNINT, get_wan_ip_link_connection_vid, set_wan_ip_link_connection_vid, NULL, NULL}, {"VLANPriority", &DMWRITE, DMT_UNINT, get_wan_ip_link_connection_vpriority, set_wan_ip_link_connection_vpriority, NULL, NULL}, diff --git a/dm/dmtree/tr098/x_inteno_se_wifi.c b/dm/dmtree/tr098/x_iopsys_eu_wifi.c similarity index 98% rename from dm/dmtree/tr098/x_inteno_se_wifi.c rename to dm/dmtree/tr098/x_iopsys_eu_wifi.c index 9d873d4..df58cf0 100644 --- a/dm/dmtree/tr098/x_inteno_se_wifi.c +++ b/dm/dmtree/tr098/x_iopsys_eu_wifi.c @@ -16,10 +16,10 @@ #include "dmubus.h" #include "dmcwmp.h" #include "dmcommon.h" -#include "x_inteno_se_wifi.h" +#include "x_iopsys_eu_wifi.h" #include "dmjson.h" -/*** X_INTENO_SE_Wifi. ***/ +/*** X_IOPSYS_EU_Wifi. ***/ DMLEAF tsewifiParam[] = { {"Bandsteering_Enable", &DMWRITE, DMT_BOOL, get_bandsteering_enable, set_bandsteering_enable, NULL, NULL}, {"Bandsteering_Rssi_Threshold", &DMWRITE, DMT_BOOL, get_bandsteering_rssi_threshold, set_bandsteering_rssi_threshold, NULL, NULL}, @@ -34,7 +34,7 @@ DMOBJ tsewifiObj[] = { {0} }; -/*** X_INTENO_SE_Wifi.Radio.{i}. ***/ +/*** X_IOPSYS_EU_Wifi.Radio.{i}. ***/ DMLEAF tsewifiradioParam[] = { {"Alias", &DMWRITE, DMT_STRING, get_radio_alias, set_radio_alias, NULL, NULL}, {"Frequency", &DMREAD, DMT_STRING, get_wifi_frequency, NULL, NULL, NULL}, diff --git a/dm/dmtree/tr098/x_inteno_se_wifi.h b/dm/dmtree/tr098/x_iopsys_eu_wifi.h similarity index 100% rename from dm/dmtree/tr098/x_inteno_se_wifi.h rename to dm/dmtree/tr098/x_iopsys_eu_wifi.h diff --git a/dm/dmtree/tr181/bridging.c b/dm/dmtree/tr181/bridging.c index daa8cb0..6c7f282 100644 --- a/dm/dmtree/tr181/bridging.c +++ b/dm/dmtree/tr181/bridging.c @@ -40,7 +40,7 @@ DMLEAF tDridgingBridgeParams[] = { {"Alias", &DMWRITE, DMT_STRING, get_br_alias, set_br_alias, NULL, NULL}, {"Enable", &DMWRITE, DMT_BOOL, get_br_enable, set_br_enable, NULL, NULL}, {"Status", &DMREAD, DMT_STRING, get_br_status, NULL, NULL, NULL}, -{"X_INTENO_COM_AssociatedInterfaces", &DMWRITE, DMT_STRING, get_br_associated_interfaces, set_br_associated_interfaces, NULL, NULL}, +{CUSTOM_PREFIX"AssociatedInterfaces", &DMWRITE, DMT_STRING, get_br_associated_interfaces, set_br_associated_interfaces, NULL, NULL}, {0} }; diff --git a/dm/dmtree/tr181/wifi.c b/dm/dmtree/tr181/wifi.c index 905b6cd..4f672c3 100644 --- a/dm/dmtree/tr181/wifi.c +++ b/dm/dmtree/tr181/wifi.c @@ -1079,7 +1079,7 @@ int set_access_point_security_modes(char *refparam, struct dmctx *ctx, void *dat else if (strcmp(value, "WEP-64") == 0 || strcmp(value, "WEP-128") == 0) { reset_wlan(((struct wifi_acp_args *)data)->wifi_acp_sec); dmuci_set_value_by_section(((struct wifi_acp_args *)data)->wifi_acp_sec, "encryption", "wep-open"); - wepkey64("Inteno", strk64); + wepkey64("Iopsys", strk64); int i = 0; while (i < 4) { dmasprintf(&option, "key%d", i + 1); @@ -1574,7 +1574,7 @@ int add_wifi_ssid(char *refparam, struct dmctx *ctx, void *data, char **instance check_create_dmmap_package("dmmap_wireless"); inst = get_last_instance_icwmpd("dmmap_wireless", "wifi-iface", "ssidinstance"); - sprintf(ssid, "Inteno_%d", inst ? (atoi(inst)+1) : 1); + sprintf(ssid, "Iopsys_%d", inst ? (atoi(inst)+1) : 1); dmuci_add_section_and_rename("wireless", "wifi-iface", &s, &value); dmuci_set_value_by_section(s, "device", "wl0"); dmuci_set_value_by_section(s, "encryption", "none"); diff --git a/stun/config.c b/stun/config.c index ba1b325..f2759ab 100644 --- a/stun/config.c +++ b/stun/config.c @@ -1,7 +1,7 @@ /* * config.c -- contains functions that allows reading and loading of uci config parameters of stun * - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Omar Kallel * diff --git a/stun/log.c b/stun/log.c index d18293b..c2aafd3 100644 --- a/stun/log.c +++ b/stun/log.c @@ -1,7 +1,7 @@ /* * log.c : conatains function used log traces * - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Omar Kallel * diff --git a/stun/stun.c b/stun/stun.c index dce8127..d755881 100644 --- a/stun/stun.c +++ b/stun/stun.c @@ -1,7 +1,7 @@ /* * stun.c -- the main file of stun application * - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Omar Kallel * diff --git a/stun/ubus.c b/stun/ubus.c index 8b0221e..c09330b 100644 --- a/stun/ubus.c +++ b/stun/ubus.c @@ -2,7 +2,7 @@ * ubus.c -- This file conatains functions that allow to make ubus calls * * - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Omar Kallel * diff --git a/xmpp/xmpp.c b/xmpp/xmpp.c index a327aa5..46223d6 100644 --- a/xmpp/xmpp.c +++ b/xmpp/xmpp.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane * diff --git a/xmpp/xmpp.h b/xmpp/xmpp.h index 8200aed..328ed48 100644 --- a/xmpp/xmpp.h +++ b/xmpp/xmpp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane * diff --git a/xmpp/xmppcmd.c b/xmpp/xmppcmd.c index b41dbe5..1f0108c 100644 --- a/xmpp/xmppcmd.c +++ b/xmpp/xmppcmd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane * diff --git a/xmpp/xmppcmd.h b/xmpp/xmppcmd.h index 7d7ab60..3edc09e 100644 --- a/xmpp/xmppcmd.h +++ b/xmpp/xmppcmd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane * diff --git a/xmpp/xmppconfig.c b/xmpp/xmppconfig.c index 0b9c989..70242a4 100644 --- a/xmpp/xmppconfig.c +++ b/xmpp/xmppconfig.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane * diff --git a/xmpp/xmppconfig.h b/xmpp/xmppconfig.h index 9ec6f63..48198c9 100644 --- a/xmpp/xmppconfig.h +++ b/xmpp/xmppconfig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane * diff --git a/xmpp/xmpplog.c b/xmpp/xmpplog.c index dad8068..e405b05 100644 --- a/xmpp/xmpplog.c +++ b/xmpp/xmpplog.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane * diff --git a/xmpp/xmpplog.h b/xmpp/xmpplog.h index 000c43b..22b7aa2 100644 --- a/xmpp/xmpplog.h +++ b/xmpp/xmpplog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane * diff --git a/xmpp/xmppuci.c b/xmpp/xmppuci.c index cdc3b83..29c556c 100644 --- a/xmpp/xmppuci.c +++ b/xmpp/xmppuci.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane * diff --git a/xmpp/xmppuci.h b/xmpp/xmppuci.h index ce36b69..b3351d9 100644 --- a/xmpp/xmppuci.h +++ b/xmpp/xmppuci.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Inteno Broadband Technology AB. All rights reserved. + * Copyright (C) 2018 iopsys Software Solutions AB. All rights reserved. * * Author: Amin Ben Ramdhane *