From ea6fc2c3ffb8da908e8d83984a4fdcac54405b64 Mon Sep 17 00:00:00 2001
From: anatar818 <151121941+anatar818@users.noreply.github.com>
Date: Fri, 19 Jun 2026 16:08:56 +0530
Subject: [PATCH 1/2] RDKBACCL-1853 SSH not working - Ethernet Configurable WAN
 Interface Integration

SSH not working - Ethernet Configurable WAN Interface Integration
Modified the code to make it more generic and allow customised wan interface for the configurable wan feature
---
 source/firewall/firewall.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/firewall/firewall.c b/source/firewall/firewall.c
index 50538050..451e7716 100644
--- a/source/firewall/firewall.c
+++ b/source/firewall/firewall.c
@@ -12479,7 +12479,11 @@ 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)
+	       #ifdef FEATURE_RDKB_CONFIGURABLE_WAN_INTERFACE
+	         if (strcmp(current_wan_ifname, default_wan_ifname ) != 0)
+		   #else		 
+             if (strcmp(current_wan_ifname, default_wan_ifname ) == 0)
+		   #endif		 
             {
               fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", current_wan_ifname);
             }

From fa71aaa1fde21c7e0cf884d0a7b0e183afdba65f Mon Sep 17 00:00:00 2001
From: anatar818 <151121941+anatar818@users.noreply.github.com>
Date: Mon, 22 Jun 2026 12:52:17 +0530
Subject: [PATCH 2/2] Update firewall.c

---
 source/firewall/firewall.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/firewall/firewall.c b/source/firewall/firewall.c
index 451e7716..556167bd 100644
--- a/source/firewall/firewall.c
+++ b/source/firewall/firewall.c
@@ -12480,10 +12480,9 @@ static int prepare_subtables(FILE *raw_fp, FILE *mangle_fp, FILE *nat_fp, FILE *
    {
            //ETH WAN is TC XB6 exclusive feature
 	       #ifdef FEATURE_RDKB_CONFIGURABLE_WAN_INTERFACE
-	         if (strcmp(current_wan_ifname, default_wan_ifname ) != 0)
-		   #else		 
-             if (strcmp(current_wan_ifname, default_wan_ifname ) == 0)
-		   #endif		 
+	         fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", current_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);
             }
@@ -12491,6 +12490,7 @@ static int prepare_subtables(FILE *raw_fp, FILE *mangle_fp, FILE *nat_fp, FILE *
             {
               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
    {