diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch')
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch index 6bfe783af..428d4a67e 100644 --- a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch +++ b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch @@ -1,4 +1,4 @@ -From 07bba51a168b769563a649f1c0f3a9126f480e57 Mon Sep 17 00:00:00 2001 +From 24bac5f6660ec5e5ea15c0f062dc4a08fbc0e876 Mon Sep 17 00:00:00 2001 From: AppaRao Puli <apparao.puli@linux.intel.com> Date: Thu, 2 Apr 2020 17:06:07 +0530 Subject: [PATCH] Adding channel specific privilege to network @@ -26,7 +26,7 @@ Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com> 4 files changed, 271 insertions(+), 1 deletion(-) diff --git a/ethernet_interface.cpp b/ethernet_interface.cpp -index c47a759..d7a4168 100644 +index 607e658..e2b2da9 100644 --- a/ethernet_interface.cpp +++ b/ethernet_interface.cpp @@ -45,6 +45,10 @@ constexpr auto PROPERTY_INTERFACE = "org.freedesktop.DBus.Properties"; @@ -48,7 +48,7 @@ index c47a759..d7a4168 100644 // Emit deferred signal. if (emitSignal) -@@ -1148,5 +1153,124 @@ std::string EthernetInterface::defaultGateway6(std::string gateway) +@@ -1175,5 +1180,124 @@ std::string EthernetInterface::defaultGateway6(std::string gateway) manager.writeToConfigurationFile(); return gw; } @@ -174,7 +174,7 @@ index c47a759..d7a4168 100644 } // namespace network } // namespace phosphor diff --git a/ethernet_interface.hpp b/ethernet_interface.hpp -index e2418a2..60fd272 100644 +index 8e28b51..ebba151 100644 --- a/ethernet_interface.hpp +++ b/ethernet_interface.hpp @@ -2,11 +2,14 @@ @@ -192,7 +192,7 @@ index e2418a2..60fd272 100644 #include <sdbusplus/server/object.hpp> #include <string> #include <xyz/openbmc_project/Collection/DeleteAll/server.hpp> -@@ -23,7 +26,8 @@ using Ifaces = sdbusplus::server::object::object< +@@ -33,7 +36,8 @@ using Ifaces = sdbusplus::server::object::object< sdbusplus::xyz::openbmc_project::Network::server::MACAddress, sdbusplus::xyz::openbmc_project::Network::IP::server::Create, sdbusplus::xyz::openbmc_project::Network::Neighbor::server::CreateStatic, @@ -202,7 +202,7 @@ index e2418a2..60fd272 100644 using IP = sdbusplus::xyz::openbmc_project::Network::server::IP; -@@ -31,11 +35,14 @@ using EthernetInterfaceIntf = +@@ -41,11 +45,14 @@ using EthernetInterfaceIntf = sdbusplus::xyz::openbmc_project::Network::server::EthernetInterface; using MacAddressIntf = sdbusplus::xyz::openbmc_project::Network::server::MACAddress; @@ -217,10 +217,10 @@ index e2418a2..60fd272 100644 class Manager; // forward declaration of network manager. -@@ -233,6 +240,14 @@ class EthernetInterface : public Ifaces - */ +@@ -244,6 +251,14 @@ class EthernetInterface : public Ifaces std::string defaultGateway6(std::string gateway) override; + using EthernetInterfaceIntf::dhcpEnabled; + /** @brief sets the channel maxium privilege. + * @param[in] value - Channel privilege which needs to be set on the + * system. @@ -229,10 +229,10 @@ index e2418a2..60fd272 100644 + std::string maxPrivilege(std::string value) override; + + using ChannelAccessIntf::maxPrivilege; - using EthernetInterfaceIntf::dHCPEnabled; using EthernetInterfaceIntf::interfaceName; using EthernetInterfaceIntf::linkUp; -@@ -356,6 +371,26 @@ class EthernetInterface : public Ifaces + using EthernetInterfaceIntf::nicEnabled; +@@ -366,6 +381,26 @@ class EthernetInterface : public Ifaces * @returns true/false value if the address is static */ bool originIsManuallyAssigned(IP::AddressOrigin origin); @@ -260,7 +260,7 @@ index e2418a2..60fd272 100644 } // namespace network diff --git a/network_manager.cpp b/network_manager.cpp -index c55c9bb..50ff908 100644 +index 881b767..847852f 100644 --- a/network_manager.cpp +++ b/network_manager.cpp @@ -36,6 +36,13 @@ extern std::unique_ptr<Timer> restartTimer; @@ -380,10 +380,10 @@ index c55c9bb..50ff908 100644 bool Manager::createDefaultNetworkFiles(bool force) diff --git a/network_manager.hpp b/network_manager.hpp -index 6815d3f..96e20a6 100644 +index 227955c..9f5b7a9 100644 --- a/network_manager.hpp +++ b/network_manager.hpp -@@ -151,6 +151,12 @@ class Manager : public details::VLANCreateIface +@@ -155,6 +155,12 @@ class Manager : public details::VLANCreateIface return (interfaces.find(intf) != interfaces.end()); } @@ -396,7 +396,7 @@ index 6815d3f..96e20a6 100644 protected: /** @brief Persistent sdbusplus DBus bus connection. */ sdbusplus::bus::bus& bus; -@@ -173,6 +179,9 @@ class Manager : public details::VLANCreateIface +@@ -177,6 +183,9 @@ class Manager : public details::VLANCreateIface /** @brief Network Configuration directory. */ fs::path confDir; |