From db7478e9f09bcfc4787a80be8bff4eb70f84e394 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Wed, 3 Jun 2020 15:17:02 +0200
Subject: [PATCH] enb: fix eNB shutdown if layers cant be initialized

this fixed #1392 which ocurrured because we were going on with the eNB
init even if the radio failed to initialize
---
 srsenb/src/enb.cc | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/srsenb/src/enb.cc b/srsenb/src/enb.cc
index 395417cb9..69febd81c 100644
--- a/srsenb/src/enb.cc
+++ b/srsenb/src/enb.cc
@@ -79,31 +79,41 @@ int enb::init(const all_args_t& args_, srslte::logger* logger_)
     return SRSLTE_ERROR;
   }
 
-  // Init layers
+  // Init Radio
   if (lte_radio->init(args.rf, lte_phy.get())) {
     log.console("Error initializing radio.\n");
     ret = SRSLTE_ERROR;
   }
 
-  if (lte_phy->init(args.phy, phy_cfg, lte_radio.get(), lte_stack.get())) {
-    log.console("Error initializing PHY.\n");
-    ret = SRSLTE_ERROR;
+  // Only Init PHY if radio couldn't be initialized
+  if (ret == SRSLTE_SUCCESS) {
+    if (lte_phy->init(args.phy, phy_cfg, lte_radio.get(), lte_stack.get())) {
+      log.console("Error initializing PHY.\n");
+      ret = SRSLTE_ERROR;
+    }
   }
 
-  if (lte_stack->init(args.stack, rrc_cfg, lte_phy.get())) {
-    log.console("Error initializing stack.\n");
-    ret = SRSLTE_ERROR;
+  // Only init Stack if both radio and PHY could be initialized
+  if (ret == SRSLTE_SUCCESS) {
+    if (lte_stack->init(args.stack, rrc_cfg, lte_phy.get())) {
+      log.console("Error initializing stack.\n");
+      ret = SRSLTE_ERROR;
+    }
   }
 
   stack = std::move(lte_stack);
   phy   = std::move(lte_phy);
   radio = std::move(lte_radio);
 
-  log.console("\n==== eNodeB started ===\n");
-  log.console("Type <t> to view trace\n");
-
-  started = (ret == SRSLTE_SUCCESS);
+  started = true; // set to true in any case to allow stopping the eNB if an error happened
 
+  if (ret == SRSLTE_SUCCESS) {
+    log.console("\n==== eNodeB started ===\n");
+    log.console("Type <t> to view trace\n");
+  } else {
+    // if any of the layers failed to start, make sure the rest is stopped in a controlled manner
+    stop();
+  }
   return ret;
 }