Merge remote-tracking branch 'origin/develop' into x2

2018-09-21 16:01:52 +02:00
parent 2c27a38dc3 7d602d5cc2
commit 67cc97a42c
128 changed files with 7074 additions and 5521 deletions
@@ -384,7 +384,10 @@ void x2ap_eNB_handle_sctp_init_msg_multi_cnf(
  /* Exit if CNF message reports failure.
   * Failure means multi_sd < 0.
   */
-  DevAssert(instance->multi_sd >= 0);
+  if (instance->multi_sd < 0) {
+    X2AP_ERROR("Error: be sure to properly configure X2 in your configuration file.\n");
+    DevAssert(instance->multi_sd >= 0);
+  }

  /* Trying to connect to the provided list of eNB ip address */