RDK-55826: Implement T2 Eventing in Network Manager Plugin #282
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -22,6 +22,8 @@ | |||||
| #include <thread> | ||||||
| #include <string> | ||||||
| #include <map> | ||||||
| #include <sstream> | ||||||
| #include <fstream> | ||||||
| #include <NetworkManager.h> | ||||||
| #include <libnm/NetworkManager.h> | ||||||
| #include "Module.h" | ||||||
|
|
@@ -389,5 +391,100 @@ namespace WPEFramework | |||||
| return false; | ||||||
| } | ||||||
|
|
||||||
| std::string nmUtils::resolveGatewayMac(const std::string& gatewayIp) | ||||||
| { | ||||||
| std::string mac = ""; | ||||||
| std::string arpFile = "/proc/net/arp"; | ||||||
| std::ifstream file(arpFile); | ||||||
| std::string line; | ||||||
|
|
||||||
| if (!file.is_open()) { | ||||||
| NMLOG_ERROR("Failed to open %s", arpFile.c_str()); | ||||||
| return mac; | ||||||
| } | ||||||
|
|
||||||
| // Skip header | ||||||
| std::getline(file, line); | ||||||
|
|
||||||
| while (std::getline(file, line)) { | ||||||
| std::istringstream iss(line); | ||||||
| std::string ip, hwType, flags, hwAddr; | ||||||
gururaajar marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
|
||||||
| if (iss >> ip >> hwType >> flags >> hwAddr) { | ||||||
| if (ip == gatewayIp && hwAddr != "00:00:00:00:00:00") { | ||||||
| mac = hwAddr; | ||||||
| NMLOG_INFO("Resolved gateway IP %s to MAC %s", gatewayIp.c_str(), mac.c_str()); | ||||||
|
There was a problem hiding this comment. This function logs the resolved gateway MAC at INFO level. MAC addresses are typically treated as sensitive identifiers; consider lowering this to DEBUG and/or avoid logging the full MAC unless needed for diagnostics.
Suggested change
|
||||||
| break; | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| if (mac.empty()) { | ||||||
| NMLOG_WARNING("Could not resolve gateway IP %s to MAC address", gatewayIp.c_str()); | ||||||
| } | ||||||
|
|
||||||
| return mac; | ||||||
| } | ||||||
|
|
||||||
| std::string nmUtils::getGatewayMacAddress(NMClient* client, const std::string& interface) | ||||||
| { | ||||||
| std::string gatewayMac = ""; | ||||||
|
|
||||||
| if (client == NULL) { | ||||||
| NMLOG_ERROR("NMClient is NULL"); | ||||||
| return gatewayMac; | ||||||
| } | ||||||
|
|
||||||
| if (interface.empty()) { | ||||||
| NMLOG_ERROR("Interface name is empty"); | ||||||
| return gatewayMac; | ||||||
| } | ||||||
|
|
||||||
| // Get all active connections and find the one for our interface | ||||||
| const GPtrArray *activeConnections = nm_client_get_active_connections(client); | ||||||
| if (!activeConnections) { | ||||||
| NMLOG_WARNING("No active connections found"); | ||||||
| return gatewayMac; | ||||||
| } | ||||||
|
|
||||||
| for (guint i = 0; i < activeConnections->len; i++) { | ||||||
| NMActiveConnection *activeConn = NM_ACTIVE_CONNECTION(g_ptr_array_index(activeConnections, i)); | ||||||
| if (!activeConn) continue; | ||||||
|
|
||||||
| // Get devices for this connection | ||||||
| const GPtrArray *devices = nm_active_connection_get_devices(activeConn); | ||||||
| if (!devices) continue; | ||||||
|
|
||||||
| // Check if this connection belongs to our interface | ||||||
| for (guint j = 0; j < devices->len; j++) { | ||||||
| NMDevice *device = NM_DEVICE(g_ptr_array_index(devices, j)); | ||||||
| if (!device) continue; | ||||||
|
|
||||||
| const char *ifname = nm_device_get_iface(device); | ||||||
| if (ifname && interface == ifname) { | ||||||
| // Found the connection for our interface | ||||||
| NMIPConfig *ip4Config = nm_active_connection_get_ip4_config(activeConn); | ||||||
| if (ip4Config) { | ||||||
| const char *gateway = nm_ip_config_get_gateway(ip4Config); | ||||||
| if (gateway) { | ||||||
| NMLOG_DEBUG("Found gateway IP for %s: %s", interface.c_str(), gateway); | ||||||
| // Use ARP to resolve gateway IP to MAC address | ||||||
| gatewayMac = resolveGatewayMac(gateway); | ||||||
| return gatewayMac; | ||||||
| } else { | ||||||
| NMLOG_WARNING("No gateway found for %s", interface.c_str()); | ||||||
| } | ||||||
| } else { | ||||||
| NMLOG_WARNING("No IPv4 configuration found for %s", interface.c_str()); | ||||||
| } | ||||||
| return gatewayMac; | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| NMLOG_WARNING("No active connection found for interface %s", interface.c_str()); | ||||||
| return gatewayMac; | ||||||
| } | ||||||
|
|
||||||
| } // Plugin | ||||||
| } // WPEFramework | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change the marker name to clearly indicate ethernet connectivity failed.