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

RDKCOM-4489 RDKBDEV-2282: Support for updating configurable WAN interface to Tele… #65

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

RDKCOM-4489 RDKBDEV-2282: Support for updating configurable WAN interface to Tele… #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 2 deletions source/WanManager/wanmgr_interface_sm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#endif

#define IF_SIZE 32
#define DEFAULT_IFNAME "erouter0"
#define LOOP_TIMEOUT 50000 // timeout in microseconds. This is the state machine loop interval
#define RESOLV_CONF_FILE "/etc/resolv.conf"
#define LOOPBACK "127.0.0.1"
Expand Down Expand Up @@ -1066,7 +1065,13 @@ static void updateInterfaceToVoiceManager(WanMgr_IfaceSM_Controller_t* pWanIface
// Update the Interface name after auto wan sesning is complete.
// When interface is down (due to cable removal etc) set Interface name to empty string
if (voip_started)
strncpy(voipIfName, DEFAULT_IFNAME, sizeof(voipIfName));
{
#if defined(FEATURE_RDKB_CONFIGURABLE_WAN_INTERFACE)
strncpy(voipIfName, p_VirtIf->Name, sizeof(voipIfName));
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we remove FEATURE_RDKB_CONFIGURABLE_WAN_INTERFACE check and use p_VirtIf->Name as default ?
p_VirtIf->Name will always have the value.

#else
strncpy(voipIfName, "erouter0", sizeof(voipIfName));
#endif
}

/* If there is a VOIP interface present, then do not update DATA vlan name to TelecoVoiceManager. */
for(int virIf_id=0; virIf_id< pWanIfaceData->NoOfVirtIfs; virIf_id++)
Expand Down