RDKBNETWOR-66 : Implement MAP-E in RdkWanManager #134

Krithiksha11 · 2025-07-18T06:58:47Z

Reason for change: Receive the MAP-E options from DhcpManager and configure the tunnel interface.
Test Procedure: Verify functionality by passing DHCPv6 Option 94 and the ip6tnl tunnel interface is correctly configured and brought up.
Testing Done : Results are captured in RDKBNETWOR-66
Risks: None.

Reason for change: Receive the MAP-E options from DhcpManager and configure the tunnel interface. Test Procedure: Verify functionality by passing DHCPv6 Option 94 and the ip6tnl tunnel interface is correctly configured and brought up. Testing Done : Results are captured in RDKBNETWOR-66 Risks: None. Signed-off-by: Krithiksha Prabhakar <krithiksha.prabhakar@telekom-digital.com>

Reason for change: Enclose MAP-E logic within FEATURE_MAPE flag Signed-off-by: Krithiksha Prabhakar <krithiksha.prabhakar@telekom-digital.com>

Reason for change: Write the PSID vlaues to /proc/nat_port so that the kernel reads these value and configures correct ports for MAPE. Test Procedure: Verify functionality by passing DHCPv6 Option 94 and the ip6tnl tunnel interface is correctly configured and brought up. Testing Done : Results are captured in RDKBNETWOR-66 Risks: None. Signed-off-by: Krithiksha Prabhakar <krithiksha.prabhakar@telekom-digital.com>

S-Parthiban-Selvaraj · 2025-08-26T14:00:58Z

source/WanManager/wanmgr_interface_sm.c

+    char wan_interface[BUFLEN_64]={0};
+
+    CcspTraceInfo(("%s %d - stop MAP-E\n", __FUNCTION__, __LINE__));
+    if (syscfg_get(NULL, SYSCFG_WAN_INTERFACE, wan_interface, sizeof(wan_interface)) != ANSC_STATUS_SUCCESS)


Why do we need a syscfg, we can use the current interface name.

S-Parthiban-Selvaraj · 2025-08-26T14:03:00Z

source/WanManager/wanmgr_interface_sm.c

+    }
+#endif
+
+#ifdef FEATURE_MAPE


Isn't it similar to the previous if condition for the MAPE? can we have single condition?

Yes, merged to single if condition

S-Parthiban-Selvaraj · 2025-08-26T14:08:39Z

source/WanManager/wanmgr_interface_sm.c

+                CcspTraceError(("%s %d Error resetting MAP-T configuration", __FUNCTION__, __LINE__));
+            }
+
+            /* Clear DHCPv4 client */


Starting DHCPv4 should be common for both MAPE and MAPT.

Moved outside if condition

S-Parthiban-Selvaraj · 2025-08-26T14:09:32Z

source/WanManager/wanmgr_interface_sm.c

-        CcspTraceInfo(("%s %d: Stopping DHCP v4\n", __FUNCTION__, __LINE__));
-        WanManager_StopDhcpv4Client(p_VirtIf, STOP_DHCP_WITH_RELEASE);
-    }
+        if (p_VirtIf->IP.Dhcp4cStatus == DHCPC_STARTED)


Stopping DHCPv4 should be common for both MAPE and MAPT

Moved outside MAPT condition

S-Parthiban-Selvaraj · 2025-08-26T14:11:46Z

source/WanManager/wanmgr_net_utils.c

+    inet_ntop(AF_INET6, &in6, tunnel_source, sizeof(tunnel_source));
+
+    //tunnel_source
+    ret = v_secure_system("ip -6 tunnel add %s mode ip4ip6 remote %s local %s encaplimit none dev %s", TUNNEL_NAME, br_ipv6_prefix, tunnel_source, "erouter0");


Please don't hard code erouter0

S-Parthiban-Selvaraj · 2025-08-26T14:16:50Z

source/WanManager/wanmgr_interface_sm.c

 #endif //FEATURE_MAPT
+
+#ifdef FEATURE_MAPE
+    else if ( pInterface->Selection.Status == WAN_IFACE_ACTIVE && p_VirtIf->Status == WAN_IFACE_STATUS_UP && p_VirtIf->MAP.dhcp6cMAPparameters.mapType == MAP_TYPE_MAPE && p_VirtIf->MAP.MapeStatus == WAN_IFACE_MAPE_STATE_UP)


Please add it with the MAPT if condition itself. Both are same transition

Combined the conditions

S-Parthiban-Selvaraj · 2025-08-26T14:17:46Z

source/WanManager/wanmgr_interface_sm.c

    }
 #endif //FEATURE_MAPT
+
+#ifdef FEATURE_MAPE


Lets keep both transitions together.

Combined the conditions

S-Parthiban-Selvaraj · 2025-08-26T14:19:41Z

source/WanManager/wanmgr_net_utils.c

+#define BUFF_SIZE_64          64
+#define BUFF_SIZE_1024        1024
+#define IPV4_ADDR_LEN_IN_BITS 32
+#define BUF_LEN (10 * (sizeof(struct inotify_event) + 255 + 1))


is this used in the code?

Removed unused macros

S-Parthiban-Selvaraj · 2025-08-26T15:00:46Z

source/WanManager/wanmgr_net_utils.c

 }

+#ifdef FEATURE_MAPE
+ANSC_STATUS WanManager_MAPEConfiguration(ipc_map_data_t *dhcp6cMAPEMsgBody)


Can this function be moved to a new file for MAPE?

Moved to new file as suggested

rdkcmf-jenkins · 2025-08-29T10:45:37Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 2 files pending identification.

Protex Server Path: /home/blackduck/github/wan-manager/134/rdkcentral/RdkWanManager
Commit: 109927b

Report detail: gist'

Reason for change: Address the review comments. Test Procedure: Verify functionality by passing DHCPv6 Option 94 and the ip6tnl tunnel interface is correctly configured and brought up. Testing Done : Results are captured in RDKBNETWOR-66 Risks: None. Signed-off-by: Krithiksha Prabhakar <krithiksha.prabhakar@telekom-digital.com>

rdkcmf-jenkins · 2025-08-29T11:31:55Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 2 files pending identification.

Protex Server Path: /home/blackduck/github/wan-manager/134/rdkcentral/RdkWanManager
Commit: 5185d67

Report detail: gist'

rdkcmf-jenkins · 2025-08-29T11:40:05Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 2 files pending identification.

Protex Server Path: /home/blackduck/github/wan-manager/134/rdkcentral/RdkWanManager
Commit: 9694a52

Report detail: gist'

mhughesacn · 2025-08-29T15:36:33Z

Hi @Krithiksha11 : Please append a credit to NOTICE at top level, to match the new DT code:

Copyright 2025 Deutsche Telekom AG.
Licensed under the Apache License, Version 2.0

I will clear off the BD failure.
Thank you!

Reason for change: Appended a credit to NOTICE at top level, to match the new DT code. Risks: None. Signed-off-by: Krithiksha Prabhakar <krithiksha.prabhakar@telekom-digital.com>

Krithiksha11 · 2025-09-01T04:33:10Z

Hi @Krithiksha11 : Please append a credit to NOTICE at top level, to match the new DT code:
Copyright 2025 Deutsche Telekom AG.
Licensed under the Apache License, Version 2.0
I will clear off the BD failure. Thank you!

Hi @mhughesacn,

I have added the same. Please review it.

Thank you

rdkcmf-jenkins · 2025-09-01T04:35:36Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 2 files pending identification.

Protex Server Path: /home/blackduck/github/wan-manager/134/rdkcentral/RdkWanManager
Commit: 270ed20

Report detail: gist'

mhughesacn · 2025-09-01T10:51:32Z

Thank you @Krithiksha11

S-Parthiban-Selvaraj · 2025-09-02T09:47:12Z

config/RdkWanManager_v2.xml

+           <name>Enable</name>
+           <type>boolean</type>
+           <syntax>bool</syntax>
+           <writable>true</writable>


I think it would be better to keep these DMLs read-only, as we're only using RBUS events or IPC methods to send lease details to the WAN Manager.

If these DMLs are writable, it opens up the possibility for someone to modify the configuration directly, which could conflict with the current design.

I understand that the BBF specification defines them as writable, but allowing write access here could introduce issues.

mhughesacn · 2025-09-02T21:26:00Z

Hi @Krithiksha11 : I just noticed this: If you make any more changes to this PR, please will you fix the headers on the new files you created. They say "this component's Licenses.txt file", but newer headers say "this component's LICENSE file". We changed the license name a long time ago, but headers have been slow to catch up. Many thanks!

Reason for change: Address the review comments. Test Procedure: Verify functionality by passing DHCPv6 Option 94 and the ip6tnl tunnel interface is correctly configured and brought up. Testing Done : Results are captured in RDKBNETWOR-66 Risks: None. Signed-off-by: Krithiksha Prabhakar <krithiksha.prabhakar@telekom-digital.com>

Krithiksha11 · 2025-09-04T05:24:04Z

Hi @Krithiksha11 : I just noticed this: If you make any more changes to this PR, please will you fix the headers on the new files you created. They say "this component's Licenses.txt file", but newer headers say "this component's LICENSE file". We changed the license name a long time ago, but headers have been slow to catch up. Many thanks!

Hi @mhughesacn,

I have addressed the requested change. Please review them.

Thank you!

mhughesacn · 2025-09-04T11:26:15Z

Looks good - thank you!

Copilot

Pull Request Overview

This PR implements MAP-E support in RdkWanManager by adding the capability to receive MAP-E options from DhcpManager and configure the tunnel interface accordingly. The implementation includes creating a new MAP-E configuration module, updating the state machine to handle MAP-E transitions, and providing TR-181 data model support for MAP objects.

Unifies MAP-T and MAP-E handling in the WAN interface state machine
Adds new MAP-E configuration module with tunnel setup functionality
Introduces comprehensive TR-181 data model support for MAP objects

Reviewed Changes

Copilot reviewed 25 out of 25 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
source/WanManager/wanmgr_sysevents.h	Adds MAP-E feature flag definitions and syscfg variables
source/WanManager/wanmgr_sysevents.c	Updates state machine to use unified MAP_ACTIVE state
source/WanManager/wanmgr_net_utils.h	Updates function signatures to use unified MAP data structure
source/WanManager/wanmgr_net_utils.c	Refactors MAP-T functions to use unified data structure
source/WanManager/wanmgr_mape.h	New header defining MAP-E configuration functions
source/WanManager/wanmgr_mape.c	New module implementing MAP-E tunnel configuration
source/WanManager/wanmgr_interface_sm.h	Adds MAP-E interface status types
source/WanManager/wanmgr_interface_sm.c	Implements unified MAP state machine transitions
source/WanManager/wanmgr_dhcpv6_apis.c	Updates to use unified MAP data structure
source/WanManager/wanmgr_dhcp_event_handler.c	Adds MAP-E event handling support
source/WanManager/wanmgr_data.c	Adds MAP data structure initialization
source/WanManager/Makefile.am	Includes new MAP-E source file in build
source/TR-181/middle_layer_src/*	Complete TR-181 data model implementation for MAP objects
config/RdkWanManager_v2.xml	XML configuration for MAP TR-181 objects
NOTICE	Updates copyright to include Deutsche Telekom

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-09-11T13:10:40Z

source/WanManager/wanmgr_mape.c

+    syscfg_unset (NULL, "mape_psid");
+    syscfg_unset (NULL, "mape_psid_len");
+    syscfg_unset (NULL, "mape_ipv4_address");
+    syscfg_unset (NULL, "mape_ipv4_address");


Duplicate syscfg_unset call for 'mape_ipv4_address' on consecutive lines 245 and 246. Remove the duplicate call.

Suggested change

syscfg_unset (NULL, "mape_ipv4_address");

Removed the duplicate call.

Copilot · 2025-09-11T13:10:40Z

source/WanManager/wanmgr_interface_sm.c

+    CcspTraceInfo(("%s %d - stop MAP-E\n", __FUNCTION__, __LINE__));
+
+    snprintf(cmd, sizeof(cmd), "iproute del default dev %s", p_VirtIf->Name);
+    system(cmd);


Direct system() calls should be replaced with secure_wrapper functions like v_secure_system() for security. The cmd variable on line 346 is constructed from user input and should also use secure execution.

Suggested change

system(cmd);

v_secure_system(cmd);

Replaced system() with v_secure_system() calls.

Copilot · 2025-09-11T13:10:41Z

source/WanManager/wanmgr_interface_sm.c

+    system(cmd);
+
+    system("ip link set dev ip6tnl down");
+    system("ip -6 tunnel del ip6tnl");


Direct system() calls should be replaced with secure_wrapper functions like v_secure_system() for security. The cmd variable on line 346 is constructed from user input and should also use secure execution.

Suggested change

system(cmd);

system("ip link set dev ip6tnl down");

system("ip -6 tunnel del ip6tnl");

v_secure_system(cmd);

v_secure_system("ip link set dev ip6tnl down");

v_secure_system("ip -6 tunnel del ip6tnl");

Replaced system() with v_secure_system() calls.

source/WanManager/wanmgr_interface_sm.c

Signed-off-by: Parthiban Selvaraj <parthiban.selvaraj@sky.uk>

Krithiksha11 added 5 commits July 18, 2025 06:08

Merge branch 'rdkcentral:main' into RDKBNETWOR-66_MAPE

8d5ae0f

RDKBNETWOR-66 : Enclose MAP-E logic within FEATURE_MAPE flag

4ab4b8d

Reason for change: Enclose MAP-E logic within FEATURE_MAPE flag Signed-off-by: Krithiksha Prabhakar <krithiksha.prabhakar@telekom-digital.com>

Merge branch 'main' into RDKBNETWOR-66_MAPE

ae46318

S-Parthiban-Selvaraj requested changes Aug 26, 2025

View reviewed changes

Krithiksha11 force-pushed the RDKBNETWOR-66_MAPE branch from 1b28a7c to 109927b Compare August 29, 2025 10:44

Krithiksha11 force-pushed the RDKBNETWOR-66_MAPE branch from 109927b to 5185d67 Compare August 29, 2025 11:30

Merge branch 'main' into RDKBNETWOR-66_MAPE

9694a52

Krithiksha11 requested a review from S-Parthiban-Selvaraj August 29, 2025 11:41

RDKBNETWOR-66 : Append credit to NOTICE

270ed20

Reason for change: Appended a credit to NOTICE at top level, to match the new DT code. Risks: None. Signed-off-by: Krithiksha Prabhakar <krithiksha.prabhakar@telekom-digital.com>

S-Parthiban-Selvaraj requested changes Sep 2, 2025

View reviewed changes

Krithiksha11 force-pushed the RDKBNETWOR-66_MAPE branch from 1f6e090 to 17f486c Compare September 4, 2025 05:22

Merge branch 'main' into RDKBNETWOR-66_MAPE

99a3bc2

Krithiksha11 marked this pull request as ready for review September 9, 2025 04:46

Krithiksha11 requested a review from a team as a code owner September 9, 2025 04:46

S-Parthiban-Selvaraj requested a review from Copilot September 11, 2025 13:08

Copilot AI reviewed Sep 11, 2025

View reviewed changes

Krithiksha11 force-pushed the RDKBNETWOR-66_MAPE branch from fbf6e57 to 5b4c096 Compare September 15, 2025 06:44

Merge branch 'main' into RDKBNETWOR-66_MAPE

ef719db

Krithiksha11 force-pushed the RDKBNETWOR-66_MAPE branch from 5b4c096 to ef719db Compare September 18, 2025 15:46

Krithiksha11 and others added 4 commits September 22, 2025 12:12

Merge branch 'main' into RDKBNETWOR-66_MAPE

70b7906

Merge branch 'main' into RDKBNETWOR-66_MAPE

b17b5d0

Fixing MAPT regression with the new flag

d8a2753

Signed-off-by: Parthiban Selvaraj <parthiban.selvaraj@sky.uk>

Merge branch 'main' into RDKBNETWOR-66_MAPE

be6195b

RDKBNETWOR-66 : Implement MAP-E in RdkWanManager #134

Are you sure you want to change the base?

RDKBNETWOR-66 : Implement MAP-E in RdkWanManager #134

Uh oh!

Conversation

Krithiksha11 commented Jul 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rdkcmf-jenkins commented Aug 29, 2025

Uh oh!

rdkcmf-jenkins commented Aug 29, 2025

Uh oh!

rdkcmf-jenkins commented Aug 29, 2025

Uh oh!

mhughesacn commented Aug 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Krithiksha11 commented Sep 1, 2025

Uh oh!

rdkcmf-jenkins commented Sep 1, 2025

Uh oh!

mhughesacn commented Sep 1, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mhughesacn commented Sep 2, 2025

Uh oh!

Krithiksha11 commented Sep 4, 2025

Uh oh!

mhughesacn commented Sep 4, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 11, 2025

Choose a reason for hiding this comment

mhughesacn commented Aug 29, 2025 •

edited

Loading