Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RDKBNETWOR-21 : Integrating CcspMisc changes to DHCPManager #89

Closed
wants to merge 2 commits into from
Closed

RDKBNETWOR-21 : Integrating CcspMisc changes to DHCPManager #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b1a5fa
RDKBNETWOR-21 : Integrating CcspMisc changes to DHCPManager
Dec 19, 2024
5ea61c6
Merge branch 'rdkcentral:main' into main
vizzu Jan 17, 2025
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
9 changes: 9 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@ AC_ARG_ENABLE([wanunificationsupport],
[echo "mapt unification is disabled"])
AM_CONDITIONAL(WAN_UNIFICATION_ENABLED, test "x$WAN_UNIFICATION_SUPPORT_ENABLED" = xtrue)

AC_ARG_ENABLE([dhcp_manager],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you are going to use FEATURE_RDKB_DHCP_MANAGER , then we could not need this code changes.

[ --enable-dhcp_manager Turn on dhcp_manager ],
[case "${enableval}" in
yes) DHCP_MANAGER_ENABLE=true ;;
no) DHCP_MANAGER_ENABLE=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-dhcp_manager]) ;;
esac],[DHCP_MANAGER_ENABLE=false])
AM_CONDITIONAL([DHCP_MANAGER_ENABLE], [test x$DHCP_MANAGER_ENABLE = xtrue])

dnl Checks for header files.
AC_CHECK_HEADERS([limits.h memory.h stdlib.h string.h sys/socket.h unistd.h])

Expand Down
7 changes: 6 additions & 1 deletion source/WanManager/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,13 @@ wanmanager_CPPFLAGS = -I$(top_srcdir)/source/TR-181/middle_layer_src \
wanmanager_CFLAGS = -DFEATURE_SUPPORT_RDKLOG $(DBUS_CFLAGS) $(SYSTEMD_CFLAGS)
wanmanager_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
wanmanager_SOURCES = wanmgr_webconfig_apis.c wanmgr_webconfig.c wanmgr_main.c wanmgr_ssp_action.c wanmgr_ssp_messagebus_interface.c wanmgr_core.c wanmgr_controller.c wanmgr_data.c wanmgr_sysevents.c wanmgr_interface_sm.c wanmgr_utils.c wanmgr_net_utils.c wanmgr_dhcpv4_apis.c wanmgr_dhcpv6_apis.c wanmgr_ipc.c wanmgr_dhcpv4_internal.c wanmgr_dhcpv6_internal.c wanmgr_policy_autowan_impl.c wanmgr_policy_auto_impl.c dm_pack_datamodel.c wanmgr_wan_failover.c wanmgr_policy_parallel_scan_impl.c wanmgr_dhcp_legacy_apis.c
wanmanager_LDADD = $(wanmanager_DEPENDENCIES) -lccsp_common -lrdkloggers $(DBUS_LIBS) $(SYSTEMD_LDFLAGS) -lhal_platform -lapi_dhcpv4c -lnanomsg -lwebconfig_framework -lmsgpackc -ldhcp_client_utils -lprivilege -lrbus -lsecure_wrapper
wanmanager_LDADD = $(wanmanager_DEPENDENCIES) -lccsp_common -lrdkloggers $(DBUS_LIBS) $(SYSTEMD_LDFLAGS) -lhal_platform -lapi_dhcpv4c -lnanomsg -lwebconfig_framework -lmsgpackc -lprivilege -lrbus -lsecure_wrapper

if DHCP_MANAGER_ENABLE
Copy link
Contributor

@kul2241 kul2241 Jan 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't need to create new build flag for it, we could use the existing FEATURE_RDKB_DHCP_MANAGER build flags.

wanmanager_LDADD += -lCcspDhcpMgr_Dhcpv6Client -lCcspDhcpMgr_Dhcpv4Client
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wan Manager does not need to talk with dhcp manager client library, so line 37 is not required.

else
wanmanager_LDADD += -ldhcp_client_utils
endif

if WAN_UNIFICATION_ENABLED
wanmanager_SOURCES += DHCPv6cMsgHandler/dhcpv6c_msg_apis.c
Expand Down