Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ sequenceDiagram
| Handler | IARM Bus Manager Token | TR-181 Subtree |
|---------|----------------------|----------------|
| `hostIf_DeviceClient_ReqHandler` | `deviceMgr` | `Device.DeviceInfo.*` |
| `hostIf_WiFi_ReqHandler` | `wifiMgr` | `Device.WiFi.*` |
| `hostIf_EthernetClient_ReqHandler` | `ethernetMgr` | `Device.Ethernet.*` |
| `hostIf_IPClient_ReqHandler` | `ipMgr` | `Device.IP.*` |
| `hostIf_MoCAClient_ReqHandler` | `mocaMgr` | `Device.MoCA.*` |
Expand All @@ -140,7 +139,6 @@ Each subdirectory implements one or more TR-181 objects. Profiles contain the bu
| Profile Directory | TR-181 Object | Key Dependencies |
|-------------------|---------------|-----------------|
| `DeviceInfo/` | `Device.DeviceInfo` | IARM, rfcapi, rfcdefaults, partners\_defaults.json |
| `wifi/` | `Device.WiFi` | wifihal (libwifi) |
| `Ethernet/` | `Device.Ethernet` | sysfs, IARM |
| `IP/` | `Device.IP` | netlink / sysfs |
| `moca/` | `Device.MoCA` | IARM mocaMgr |
Expand Down Expand Up @@ -263,7 +261,6 @@ Device.MoCA=mocaMgr
Device.Ethernet=ethernetMgr
Device.IP=ipMgr
Device.Time=timeMgr
Device.WiFi=wifiMgr

[HOSTIF_JSON_CONFIG]
PORT=10999
Expand Down Expand Up @@ -296,7 +293,6 @@ The `[HOSTIF_DM_PROFILE_MGR]` section defines which manager handles each TR-181
| `--enable-t2` | `T2_EVENT_ENABLED` | Telemetry 2.0 markers |
| `--enable-webconfig` | `WEB_CONFIG_ENABLED` | WebConfig multipart support |
| `--enable-webconfig-lite` | `WEBCONFIG_LITE_ENABLE` | WebConfig Lite |
| `--enable-wifi` | `USE_WIFI_PROFILE` | WiFi profile handlers |
| `--enable-moca` | *(moca linkage)* | MoCA profile handlers |

## Build & Install
Expand Down Expand Up @@ -325,7 +321,6 @@ autoreconf -iv
./configure \
--enable-parodus \
--enable-rbus \
--enable-wifi \
--enable-moca \
--enable-t2

Expand Down
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ sequenceDiagram
| Handler | IARM Bus Manager Token | TR-181 Subtree |
|---------|----------------------|----------------|
| `hostIf_DeviceClient_ReqHandler` | `deviceMgr` | `Device.DeviceInfo.*` |
| `hostIf_WiFi_ReqHandler` | `wifiMgr` | `Device.WiFi.*` |
| `hostIf_EthernetClient_ReqHandler` | `ethernetMgr` | `Device.Ethernet.*` |
| `hostIf_IPClient_ReqHandler` | `ipMgr` | `Device.IP.*` |
| `hostIf_MoCAClient_ReqHandler` | `mocaMgr` | `Device.MoCA.*` |
Expand All @@ -151,7 +150,6 @@ Each subdirectory implements one or more TR-181 objects. Profiles contain the bu
| Profile Directory | TR-181 Object | Key Dependencies |
|-------------------|---------------|-----------------|
| `DeviceInfo/` | `Device.DeviceInfo` | IARM, rfcapi, rfcdefaults, partners\_defaults.json |
| `wifi/` | `Device.WiFi` | wifihal (libwifi) |
| `Ethernet/` | `Device.Ethernet` | sysfs, IARM |
| `IP/` | `Device.IP` | netlink / sysfs |
| `moca/` | `Device.MoCA` | IARM mocaMgr |
Expand Down Expand Up @@ -274,7 +272,6 @@ Device.MoCA=mocaMgr
Device.Ethernet=ethernetMgr
Device.IP=ipMgr
Device.Time=timeMgr
Device.WiFi=wifiMgr

[HOSTIF_JSON_CONFIG]
PORT=10999
Expand Down Expand Up @@ -307,7 +304,6 @@ The `[HOSTIF_DM_PROFILE_MGR]` section defines which manager handles each TR-181
| `--enable-t2` | `T2_EVENT_ENABLED` | Telemetry 2.0 markers |
| `--enable-webconfig` | `WEB_CONFIG_ENABLED` | WebConfig multipart support |
| `--enable-webconfig-lite` | `WEBCONFIG_LITE_ENABLE` | WebConfig Lite |
| `--enable-wifi` | `USE_WIFI_PROFILE` | WiFi profile handlers |
| `--enable-moca` | *(moca linkage)* | MoCA profile handlers |

## Build & Install
Expand Down Expand Up @@ -336,7 +332,6 @@ autoreconf -iv
./configure \
--enable-parodus \
--enable-rbus \
--enable-wifi \
--enable-moca \
--enable-t2

Expand Down
1 change: 0 additions & 1 deletion conf/mgrlist.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Device.X_COMCAST-COM_Xcalibur xreMgr
Device.Ethernet ethernetMgr
Device.IP ipMgr
Device.Time timeMgr
Device.WiFi wifiMgr
Device.DHCPv4 dhcpv4Mgr
Device.InterfaceStack ifStackMgr
Device.X_RDK_WebConfig webConfigMgr
Expand Down
1 change: 0 additions & 1 deletion conf/tr69hostIf.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Device.X_COMCAST-COM_Xcalibur.TRM=xreMgr
Device.Ethernet=ethernetMgr
Device.IP=ipMgr
Device.Time=timeMgr
Device.WiFi=wifiMgr
[HOSTIF_JSON_CONFIG]
PORT=10999
[HOSTIF_CONFIG]
Expand Down
21 changes: 0 additions & 21 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ LT_INIT
XREMGR_FLAGS=" "
MOCAMGR_FLAGS=" "
SUBDIRS_MOCA=" "
SUBDIRS_WIFI=" "
MOCA2_FLAG=" "
WIFI_PROFILE_FLAGS=" "
XRDK_SDCARD_PROFILE_FLAG=" "
XRDK_EMMC_PROFILE_FLAG=" "
SUBDIRS_STORAGESERVICE=" "
Expand Down Expand Up @@ -110,21 +108,6 @@ m4_syscmd([test -d src/hostif/profiles/moca])
m4_if(m4_sysval,[0],[AC_CONFIG_FILES([src/hostif/profiles/moca/Makefile])])
m4_if(m4_sysval,[0],[SUBDIRS_MOCA="src/hostif/profiles/moca"])

AC_ARG_ENABLE([wifi],
AS_HELP_STRING([--enable-wifi],[enable WiFi profile (default is no)]),
[
case "${enableval}" in
yes) WIFI_PROFILE_ENABLE=true
WIFI_PROFILE_FLAG="-DUSE_WIFI_PROFILE"
m4_syscmd([test -d src/hostif/profiles/wifi])
m4_if(m4_sysval,[0],[AC_CONFIG_FILES([src/hostif/profiles/wifi/Makefile])])
m4_if(m4_sysval,[0],[SUBDIRS_WIFI="src/hostif/profiles/wifi"]) ;;
no) WIFI_PROFILE_ENABLE=false AC_MSG_ERROR([wifi profile is disabled]) ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-wifi ]) ;;
esac
],
[echo "WiFi profile is disabled"])

AC_ARG_ENABLE([sdcard],
AS_HELP_STRING([--enable-sdcard],[enable X_RDKCENTRAL_COM SDcard profile (default is no)]),
[
Expand Down Expand Up @@ -402,7 +385,6 @@ AM_CONDITIONAL([WITH_THUNDER_CLIENT], [test x$THUNDER_CLIENT_ENABLE = xtrue])

AM_CONDITIONAL([WITH_MOCA_PROFILE], [test "x$enable_moca" = "xyes"])
AM_CONDITIONAL([WITH_MOCA20], [test "x$enable_moca2" = "xyes"])
AM_CONDITIONAL([WITH_WIFI_PROFILE], [test x$WIFI_PROFILE_ENABLE = xtrue])
AM_CONDITIONAL([WITH_XRDK_SDCARD_PROFILE], [test x$XRDK_SDCARD_PROFILE_ENABLE = xtrue])
AM_CONDITIONAL([WITH_XRDK_EMMC_PROFILE], [test x$XRDK_EMMC_PROFILE_ENABLE = xtrue])
AM_CONDITIONAL([WITH_DHCP_PROFILE], [test x$DHCPv4_PROFILE_ENABLE = xtrue])
Expand Down Expand Up @@ -445,13 +427,10 @@ AC_SUBST(PROFILE_SRC)
AC_SUBST(XREMGR_FLAGS)
AC_SUBST(MOCAMGR_FLAGS)
AC_SUBST(SUBDIRS_MOCA)
AC_SUBST(SUBDIRS_WIFI)
AC_SUBST(SUBDIRS_STORAGESERVICE)
AC_SUBST(SUBDIRS_DHCPv4)
AC_SUBST(SUBDIRS_INTFSTACK)
AC_SUBST(MOCA2_FLAG)
AC_SUBST(WIFI_PROFILE_ENABLE)
AC_SUBST(WIFI_PROFILE_FLAG)
AC_SUBST(XRDK_SDCARD_PROFILE_FLAG)
AC_SUBST(XRDK_EMMC_PROFILE_FLAG)
AC_SUBST(DHCPv4_PROFILE_FLAG)
Expand Down
4 changes: 2 additions & 2 deletions cov_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ cd $WORKDIR
sed -i '/PKG_CHECK_MODULES(\[PROCPS\], \[libproc >= 3.2.8\])/s/^/#/' ./configure.ac

autoreconf -i
./configure --enable-IPv6=yes --enable-wifi=yes --enable-thunder=yes
./configure --enable-IPv6=yes --enable-thunder=yes

make AM_CXXFLAGS="-I$WORKDIR/src/unittest/stubs -I$WORKDIR/src/hostif/include -I/usr/include/cjson -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$WORKDIR/src/hostif/handlers/include -I$WORKDIR/src/hostif/parodusClient/waldb -I$WORKDIR/src/hostif/profiles/DeviceInfo -I/usr/include/cjson -I$WORKDIR/src/hostif/profiles/Time -I$WORKDIR/src/hostif/profiles/Device -I/usr/include/libsoup-3.0 -I/usr/include/yajl -I$WORKDIR/src/hostif/profiles/STBService -I$WORKDIR/src/unittest/stubs/ds -I/usr/devicesettings/ds -I/usr/local/include -I$WORKDIR/src/hostif/profiles/IP -I$WORKDIR/src/hostif/profiles/Ethernet -I$WORKDIR/src/hostif/profiles/wifi -I/usr/local/include/rbus -I$WORKDIR/src/hostif/parodusClient/pal -I/usr/rdk-halif-device_settings/include -I/usr/local/include/libparodus -I/usr/local/include -I/usr/rdkvhal-devicesettings-raspberrypi4 -I/usr/local/include/ -I/usr/include/yajl -I/usr/tinyxml2 -I/usr/devicesettings/ds -I/$WORKDIR/src/hostif/httpserver/include -I/usr/remote_debugger/src/ -DIPV6_SUPPORT -DUSE_WIFI_PROFILE -DMEDIA_CLIENT -DPRIVACYMODES_CONTROL" \
make AM_CXXFLAGS="-I$WORKDIR/src/unittest/stubs -I$WORKDIR/src/hostif/include -I/usr/include/cjson -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$WORKDIR/src/hostif/handlers/include -I$WORKDIR/src/hostif/parodusClient/waldb -I$WORKDIR/src/hostif/profiles/DeviceInfo -I/usr/include/cjson -I$WORKDIR/src/hostif/profiles/Time -I$WORKDIR/src/hostif/profiles/Device -I/usr/include/libsoup-3.0 -I/usr/include/yajl -I$WORKDIR/src/hostif/profiles/STBService -I$WORKDIR/src/unittest/stubs/ds -I/usr/devicesettings/ds -I/usr/local/include -I$WORKDIR/src/hostif/profiles/IP -I$WORKDIR/src/hostif/profiles/Ethernet -I/usr/local/include/rbus -I$WORKDIR/src/hostif/parodusClient/pal -I/usr/rdk-halif-device_settings/include -I/usr/local/include/libparodus -I/usr/local/include -I/usr/rdkvhal-devicesettings-raspberrypi4 -I/usr/local/include/ -I/usr/include/yajl -I/usr/tinyxml2 -I/usr/devicesettings/ds -I/$WORKDIR/src/hostif/httpserver/include -I/usr/remote_debugger/src/ -DIPV6_SUPPORT -DMEDIA_CLIENT -DPRIVACYMODES_CONTROL" \
AM_LDFLAGS="-L/usr/local/lib -lrbus -lsecure_wrapper -lcurl -lrfcapi -lrdkloggers -llibparodus -lglib-2.0 -lnanomsg -lIARMBus -lWPEFrameworkPowerController -lwrp-c -lwdmp-c -lprocps -ltrower-base64 -lcimplog -lsoup-3.0 -L/usr/lib/x86_64-linux-gnu -lyajl -L/usr/local/lib/x86_64-linux-gnu -ltinyxml2" CXXFLAGS="-fpermissive -DPARODUS_ENABLE -DUSE_REMOTE_DEBUGGER -DUSE_THUNDER_CLIENT" \
install

Expand Down
1 change: 0 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ The `tr69hostif` module depends on a mix of middleware services, platform-facing
| WebPA gateway | Remote management plane that uses the Parodus integration path |
| Parodus daemon | Local broker service required for WebPA request and notification exchange |
| Device Settings / DS HAL | Backing implementation for `STBService` and selected device state queries |
| WiFi HAL / WiFi manager | Backing implementation for the `Device.WiFi.*` profile |
| MoCA HAL | Backing implementation for the `Device.MoCA.*` profile when enabled |
| systemd notify | Optional readiness signaling for service startup integration |

Expand Down
Loading
Loading