agent: Save controller bridge mac on controller socket

Preparative commit. Save controller bridge mac on controller socket so it could be used on send_cmdu_to_destination function on agent_ucc_listener. Also, change the update of master_socket (aka socket to the controller) to be in a single place. Signed-off-by: Moran Shoeg <[email protected]>
prplfoundation · Oct 31, 2019 · 461e141 · 461e141
1 parent a4b8e0c
commit 461e141
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/agent/src/beerocks/slave/son_slave_thread.cpp b/agent/src/beerocks/slave/son_slave_thread.cpp
@@ -3568,10 +3568,12 @@ bool slave_thread::slave_fsm(bool &call_slave_select)
     case STATE_BACKHAUL_MANAGER_CONNECTED: {
         LOG(TRACE) << "MASTER_CONNECTED";
 
+        master_socket = backhaul_manager_socket;
+        master_socket->setPeerMac(backhaul_params.controller_bridge_mac);
+
         if (!wlan_settings.band_enabled) {
 
             iface_status_operational_state = true;
-            master_socket                  = backhaul_manager_socket;
             iface_status_ap                = eRadioStatus::OFF;
             LOG(TRACE) << "goto STATE_OPERATIONAL";
             slave_state = STATE_OPERATIONAL;
@@ -3659,8 +3661,6 @@ bool slave_thread::slave_fsm(bool &call_slave_select)
             message_com::send_cmdu(platform_manager_socket, cmdu_tx);
         }
 
-        master_socket = backhaul_manager_socket;
-
         LOG(TRACE) << "goto STATE_JOIN_MASTER";
         slave_state = STATE_JOIN_MASTER;