Skip to content

RDKBACCL-1853 SSH and WebUI not working - Ethernet Configurable WAN I… #363

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

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

RDKBACCL-1853 SSH and WebUI not working - Ethernet Configurable WAN I… #363

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
34 changes: 26 additions & 8 deletions source/firewall/firewall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2382,6 +2382,16 @@ static int prepare_globals_from_configuration(void)
isComcastImage = bIsComcastImage();
sysevent_get(sysevent_fd, sysevent_token, "wan_ifname", default_wan_ifname, sizeof(default_wan_ifname));
sysevent_get(sysevent_fd, sysevent_token, "current_wan_ifname", current_wan_ifname, sizeof(current_wan_ifname));
#ifdef FEATURE_RDKB_CONFIGURABLE_WAN_INTERFACE
if ('\0' == current_wan_ifname[0]) {
char wanInterface[BUFLEN_64] = {'\0'};
syscfg_get(NULL, "wan_physical_ifname", wanInterface, sizeof(wanInterface));
if(wanInterface[0] != '\0')
snprintf(current_wan_ifname, sizeof(current_wan_ifname), "%s", wanInterface);
else
snprintf(current_wan_ifname, sizeof(current_wan_ifname), "%s", default_wan_ifname);
}
Comment on lines +2386 to +2393
#else
if ('\0' == current_wan_ifname[0]) {
if ('\0' == default_wan_ifname[0]) {
snprintf(current_wan_ifname, sizeof(current_wan_ifname), "%s", "erouter0");
Expand All @@ -2390,6 +2400,7 @@ static int prepare_globals_from_configuration(void)
snprintf(current_wan_ifname, sizeof(current_wan_ifname), "%s", default_wan_ifname);
}
}
#endif

sysevent_get(sysevent_fd, sysevent_token, "current_wan_ipaddr", current_wan_ipaddr, sizeof(current_wan_ipaddr));

Expand Down Expand Up @@ -12558,14 +12569,21 @@ static int prepare_subtables(FILE *raw_fp, FILE *mangle_fp, FILE *nat_fp, FILE *
if(bEthWANEnable)
{
//ETH WAN is TC XB6 exclusive feature
if (strcmp(current_wan_ifname, default_wan_ifname ) == 0)
{
fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", current_wan_ifname);
}
else
{
fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", default_wan_ifname);
}
#ifdef FEATURE_RDKB_CONFIGURABLE_WAN_INTERFACE
if (current_wan_ifname[0] != '\0')
fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", current_wan_ifname);
else
fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", default_wan_ifname);
#else
if (strcmp(current_wan_ifname, default_wan_ifname ) == 0)
{
fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", current_wan_ifname);
}
else
{
fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", default_wan_ifname);
}
#endif
}
else if (erouterSSHEnable) // Applicable only for PUMA7 platforms
{
Expand Down
Loading