mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compiling errors when TR064 is activated

Browse source
This commit is contained in:
Omar Kallel 2020-02-10 18:56:13 +01:00
parent 3ca094e06f
commit 142e830426
9 changed files with 36 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dmentry.c
View file

@ -26,6 +26,9 @@
#include "device.h"
#include "wepkey.h"
#ifdef BBF_TR064
#include "upnp_device.h"
#endif
LIST_HEAD(head_package_change);
unsigned char dmcli_timetrack = 0;
unsigned char dmcli_evaluatetest = 0;

10
dmtree/tr064/upnp_common.c
View file

@ -10,11 +10,11 @@
*/
#include "upnp_common.h"
#include "dmbbf.h"
#include "dmuci.h"
#include "dmubus.h"
#include "dmjson.h"
#include "dmcommon.h"
#include <libbbf_api/dmbbf.h>
#include <libbbf_api/dmuci.h>
#include <libbbf_api/dmubus.h>
#include <libbbf_api/dmjson.h>
#include <libbbf_api/dmcommon.h>
#include <json-c/json.h>
#include <stdio.h>

9
dmtree/tr064/upnp_configuration.c
View file

@ -9,13 +9,12 @@
*
*/
#include "dmbbf.h"
#include <libbbf_api/dmbbf.h>
#include "upnp_configuration.h"
#include "upnp_common.h"
#include "dmuci.h"
#include "dmubus.h"
#include "dmcommon.h"
#include "dmjson.h"
#include <libbbf_api/dmuci.h>
#include <libbbf_api/dmubus.h>
#include <libbbf_api/dmcommon.h>
#include <stdio.h>
#include <stdlib.h>

2
dmtree/tr064/upnp_configuration.h
View file

@ -11,7 +11,7 @@
#ifndef UPNP_CONFIGURATION_H
#define UPNP_CONFIGURATION_H
#include "dmbbf.h"
#include <libbbf_api/dmbbf.h>
struct upnp_configuration_args{
struct uci_section *upnpConfiguration_sec;

35
dmtree/tr064/upnp_device.c
View file

@ -9,8 +9,8 @@
*
*/
#include "dmuci.h"
#include "dmbbf.h"
#include <libbbf_api/dmuci.h>
#include <libbbf_api/dmbbf.h>
#include "upnp_device.h"
#include "deviceinfo.h"
#include "managementserver.h"
@ -43,16 +43,6 @@
#include "ppp.h"
#include "routing.h"
#include "userinterface.h"
#include "landevice.h"
#include "wandevice.h"
#include "ippingdiagnostics.h"
#include "lan_interfaces.h"
#include "layer_3_forwarding.h"
#include "x_iopsys_eu_wifi.h"
#include "layer_2_bridging.h"
#include "downloaddiagnostic.h"
#include "uploaddiagnostic.h"
#include "deviceconfig.h"
#include "firewall.h"
#include "dns.h"
#include "users.h"
@ -65,6 +55,7 @@
#include "upnp_deviceinfo.h"
#include "upnp_configuration.h"
#include "upnp_monitoring.h"
#include "upnp_device.h"
#endif
/*** UPNP ***/
@ -103,7 +94,7 @@ DMOBJ tRoot181ObjUPNPBBF[] = {
{"Time", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tTimeParams, NULL, BBFDM_BOTH},
{"UPnP", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,tUPnPObj, NULL, NULL, BBFDM_BOTH},
#if BBF_TR104
{"VoiceService", &DMREAD, NULL, NULL, NULL, browseVoiceServiceInst, NULL, NULL, tVoiceServiceObj, tVoiceServiceParam, NULL, BBFDM_BOTH},
{"VoiceService", &DMREAD, NULL, NULL, NULL, browseVoiceServiceInst, NULL, NULL, tServicesVoiceServiceObj, tServicesVoiceServiceParams, NULL, BBFDM_BOTH},
#endif
{CUSTOM_PREFIX"ICE", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_IceParam, NULL, BBFDM_BOTH},
{CUSTOM_PREFIX"IGMP", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_IgmpParam, NULL, BBFDM_BOTH},
@ -116,17 +107,17 @@ DMOBJ tRoot181ObjUPNPBBF[] = {
{CUSTOM_PREFIX"Dropbear", &DMWRITE, add_dropbear_instance, delete_dropbear_instance, NULL, browseXIopsysEuDropbear, NULL, &DMNONE, NULL, X_IOPSYS_EU_DropbearParams, NULL, BBFDM_BOTH},
{CUSTOM_PREFIX"Buttons", &DMREAD, NULL, NULL, NULL, browseXIopsysEuButton, NULL, &DMNONE, NULL, X_IOPSYS_EU_ButtonParams, NULL, BBFDM_BOTH},
{"Bridging",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tBridgingObj, NULL, NULL, BBFDM_BOTH},
{"WiFi",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tWifiObj, NULL, NULL, BBFDM_BOTH},
{"WiFi",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tWiFiObj, NULL, NULL, BBFDM_BOTH},
{"IP",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tIPObj, NULL, NULL, BBFDM_BOTH},
{"Ethernet", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tEthernetObj, NULL, NULL, BBFDM_BOTH},
{"DSL",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tDslObj, NULL, NULL, BBFDM_BOTH},
{"ATM",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tAtmObj, NULL, NULL, BBFDM_BOTH},
{"PTM", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tPtmObj, NULL, NULL, BBFDM_BOTH},
{"DHCPv4", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tDhcpv4Obj, NULL, NULL, BBFDM_BOTH},
{"Hosts", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, thostsObj, thostsParam, NULL, BBFDM_BOTH},
{"NAT", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tnatObj, NULL, NULL, BBFDM_BOTH},
{"PPP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tpppObj, NULL, NULL, BBFDM_BOTH},
{"Routing", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tRoutingObj, tRoutingParam, NULL, BBFDM_BOTH},
{"DSL",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tDSLObj, NULL, NULL, BBFDM_BOTH},
{"ATM",&DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tATMObj, NULL, NULL, BBFDM_BOTH},
{"PTM", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tPTMObj, NULL, NULL, BBFDM_BOTH},
{"DHCPv4", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tDHCPv4Obj, NULL, NULL, BBFDM_BOTH},
{"Hosts", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tHostsObj, tHostsParams, NULL, BBFDM_BOTH},
{"NAT", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tNATObj, NULL, NULL, BBFDM_BOTH},
{"PPP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tPPPObj, NULL, NULL, BBFDM_BOTH},
{"Routing", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tRoutingObj, tRoutingParams, NULL, BBFDM_BOTH},
{"XMPP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL,tXMPPObj, tXMPPParams, NULL, BBFDM_BOTH},
{0}
};

8
dmtree/tr064/upnp_deviceinfo.c
View file

@ -10,12 +10,12 @@
*/
#include <stdio.h>
#include "dmbbf.h"
#include <libbbf_api/dmbbf.h>
#include "upnp_deviceinfo.h"
#include <sys/utsname.h>
#include "dmuci.h"
#include "dmmem.h"
#include "dmcommon.h"
#include <libbbf_api/dmuci.h>
#include <libbbf_api/dmmem.h>
#include <libbbf_api/dmcommon.h>
#include <uci.h>
#include "upnp_common.h"
#include<stdbool.h>

2
dmtree/tr064/upnp_deviceinfo.h
View file

@ -11,7 +11,7 @@
#ifndef UPNP_DEVICEINFO_H
#define UPNP_DEVICEINFO_H
#include "dmbbf.h"
#include <libbbf_api/dmbbf.h>
struct upnp_dvinf_args
{

8
dmtree/tr064/upnp_monitoring.c
View file

@ -9,12 +9,12 @@
*
*/
#include "dmbbf.h"
#include <libbbf_api/dmbbf.h>
#include "upnp_monitoring.h"
#include "upnp_common.h"
#include "dmubus.h"
#include "dmcommon.h"
#include "dmjson.h"
#include <libbbf_api/dmubus.h>
#include <libbbf_api/dmcommon.h>
#include <libbbf_api/dmjson.h>
#include <time.h>
/**************************************************************************

2
dmtree/tr064/upnp_monitoring.h
View file

@ -11,7 +11,7 @@
#ifndef UPNP_MONITORING_H
#define UPNP_MONITORING_H
#include "dmbbf.h"
#include <libbbf_api/dmbbf.h>
struct upnp_ip_usage_args{
char *systemName;
char *status;