agent: Move wlan_settings configuration to AgentDB

Move "wlan_settings" configuration from son_slave_thread local variable
to the AgentDB.

Currently son_slave receive "wlan_settings" from platform_manager
using "PLATFORM_SON_SLAVE_REGISTER_REQUEST/RESPONSE" messages,
and save the settings in a local variable.

This transfer will be replaced by the use of agent_db to pass and
store "wlan_settings".

Removing of "sWlanSettings" from the tlvf will take place on
future commit.

PPM-338

Signed-off-by: Oren Vormaser <[email protected]>

agent/src/beerocks/slave/agent_db.h

@@ -110,6 +110,12 @@ class AgentDB {
         uint8_t load_balancing_enabled;
         uint8_t service_fairness_enabled;
         uint8_t rdkb_extensions_enabled;
+
+        struct sWlanSettings {
+            uint8_t band_enabled;
+            uint8_t channel;
+        } wlan_settings;
+
     } device_conf;
 
     /** 

agent/src/beerocks/slave/platform_manager/platform_manager_thread.cpp

@@ -57,9 +57,7 @@ static beerocks::eFreqType bpl_band_to_freq_type(int bpl_band)
 }
 
 static bool fill_platform_settings(
-    std::string iface_name,
-    std::shared_ptr<beerocks_message::cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE> msg,
-    main_thread::platform_common_conf_t &platform_common_conf,
+    std::string iface_name, main_thread::platform_common_conf_t &platform_common_conf,
     std::unordered_map<std::string, std::shared_ptr<beerocks_message::sWlanSettings>>
         &iface_wlan_params_map,
     Socket *sd)
@@ -103,12 +101,13 @@ static bool fill_platform_settings(
         return false;
     }
     /* update message */
-    msg->wlan_settings().band_enabled = params.enabled;
-    msg->wlan_settings().channel      = params.channel;
+    db->device_conf.wlan_settings.band_enabled = params.enabled;
+    db->device_conf.wlan_settings.channel      = params.channel;
 
     LOG(DEBUG) << "wlan settings:"
-               << " band_enabled=" << string_utils::bool_str(msg->wlan_settings().band_enabled)
-               << " channel=" << int(msg->wlan_settings().channel);
+               << " band_enabled="
+               << string_utils::bool_str(db->device_conf.wlan_settings.band_enabled)
+               << " channel=" << int(db->device_conf.wlan_settings.channel);
 
     // initialize wlan params cache
     //erase interface cache from map if exists
@@ -223,7 +222,7 @@ static bool fill_platform_settings(
     LOG(DEBUG) << "client_optimal_path_roaming_prefer_signal_strength_enabled: "
                << (unsigned)
                       db->device_conf.client_optimal_path_roaming_prefer_signal_strength_enabled;
-    LOG(DEBUG) << "band_enabled: " << (unsigned)msg->wlan_settings().band_enabled;
+    LOG(DEBUG) << "band_enabled: " << (unsigned)db->device_conf.wlan_settings.band_enabled;
     LOG(DEBUG) << "local_gw: " << db->device_conf.local_gw;
     LOG(DEBUG) << "local_controller: " << db->device_conf.local_controller;
     LOG(DEBUG) << "dfs_reentry_enabled: " << (unsigned)db->device_conf.dfs_reentry_enabled;
@@ -649,7 +648,7 @@ bool main_thread::handle_cmdu(Socket *sd, ieee1905_1::CmduMessageRx &cmdu_rx)
             do {
                 LOG(TRACE) << "Trying to read settings of iface:" << strIfaceName
                            << ", attempt=" << int(retry_cnt);
-                if (fill_platform_settings(strIfaceName, register_response, platform_common_conf,
+                if (fill_platform_settings(strIfaceName, platform_common_conf,
                                            bpl_iface_wlan_params_map, sd)) {
                     register_response->valid() = 1;
                 } else {

agent/src/beerocks/slave/son_slave_thread.cpp

@@ -1320,8 +1320,6 @@ bool slave_thread::handle_cmdu_platform_manager_message(
                 return true;
             }
 
-            wlan_settings = response->wlan_settings();
-
             auto db = AgentDB::get();
 
             /**
@@ -1380,7 +1378,9 @@ bool slave_thread::handle_cmdu_platform_manager_message(
         }
 
         // slave only reacts to band_enabled change
-        if (wlan_settings.band_enabled != notification->wlan_settings().band_enabled) {
+        auto db = AgentDB::get();
+        if (db->device_conf.wlan_settings.band_enabled !=
+            notification->wlan_settings().band_enabled) {
             LOG(DEBUG) << "band_enabled changed - performing slave_reset()";
             slave_reset();
         }
@@ -1502,7 +1502,8 @@ bool slave_thread::handle_cmdu_ap_manager_message(Socket *sd,
             return false;
         }
 
-        config_msg->channel() = wlan_settings.channel;
+        auto db               = AgentDB::get();
+        config_msg->channel() = db->device_conf.wlan_settings.channel;
 
         message_com::send_cmdu(ap_manager_socket, cmdu_tx);
 
@@ -3006,7 +3007,7 @@ bool slave_thread::slave_fsm(bool &call_slave_select)
 
         auto db = AgentDB::get();
         LOG(DEBUG) << "onboarding: " << int(0);
-        if (!wlan_settings.band_enabled) {
+        if (!db->device_conf.wlan_settings.band_enabled) {
             LOG(DEBUG) << "wlan_settings.band_enabled=false";
             LOG(TRACE) << "goto STATE_BACKHAUL_ENABLE";
             slave_state = STATE_BACKHAUL_ENABLE;
@@ -3177,7 +3178,7 @@ bool slave_thread::slave_fsm(bool &call_slave_select)
         master_socket->setPeerMac(backhaul_params.controller_bridge_mac);
 
         auto db = AgentDB::get();
-        if (!wlan_settings.band_enabled) {
+        if (!db->device_conf.wlan_settings.band_enabled) {
             LOG(TRACE) << "goto STATE_OPERATIONAL";
             slave_state = STATE_OPERATIONAL;
             break;
@@ -3384,7 +3385,10 @@ bool slave_thread::slave_fsm(bool &call_slave_select)
                 notification->platform_settings().local_master = db->device_conf.local_controller;
 
                 //Wlan Settings
-                notification->wlan_settings() = wlan_settings;
+                notification->wlan_settings().band_enabled =
+                    db->device_conf.wlan_settings.band_enabled;
+                notification->wlan_settings().channel = db->device_conf.wlan_settings.channel;
+                ;
                 // Hostap Params
                 notification->hostap()          = hostap_params;
                 notification->hostap().ant_gain = config.hostap_ant_gain;

agent/src/beerocks/slave/son_slave_thread.h

@@ -160,7 +160,6 @@ class slave_thread : public beerocks::socket_thread {
     std::string backhaul_manager_uds;
     std::string platform_manager_uds;
     sSlaveConfig config;
-    beerocks_message::sWlanSettings wlan_settings; // from platform manager //
     beerocks_message::sSonConfig son_config;
     beerocks::logging &logger;
     std::string master_version;