From 4b223ba729ef8dfb810d0c25bbe48f1ce55a333b Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Thu, 12 Oct 2017 11:50:51 +0200
Subject: [PATCH 1/3] add newline in error message

---
 lib/src/common/logger_file.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/common/logger_file.cc b/lib/src/common/logger_file.cc
index 94e5e8405..739eded8b 100644
--- a/lib/src/common/logger_file.cc
+++ b/lib/src/common/logger_file.cc
@@ -55,7 +55,7 @@ void logger_file::init(std::string file) {
   filename = file;
   logfile = fopen(filename.c_str(), "w");
   if(logfile==NULL) {
-    printf("Error: could not create log file, no messages will be logged");
+    printf("Error: could not create log file, no messages will be logged!\n");
   }
   start();
   inited = true;

From f5bc1049dc1e00c88f367f72872d926912a76918 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Thu, 12 Oct 2017 11:52:14 +0200
Subject: [PATCH 2/3] don't use log if USIM isn't initialized

---
 srsue/src/upper/usim.cc | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/srsue/src/upper/usim.cc b/srsue/src/upper/usim.cc
index 9be69383e..e1d2c204f 100644
--- a/srsue/src/upper/usim.cc
+++ b/srsue/src/upper/usim.cc
@@ -105,20 +105,18 @@ void usim::stop()
 
 void usim::get_imsi_vec(uint8_t* imsi_, uint32_t n)
 {
-  if (!initiated)
-  {
-    usim_log->error("Getting IMSI: USIM not initiated\n");
+  if (!initiated) {
+    fprintf(stderr, "USIM not initiated!\n");
     return;
   }
-  if(NULL == imsi_ || n < 15)
-  {
+
+  if(NULL == imsi_ || n < 15) {
     usim_log->error("Invalid parameters to get_imsi_vec");
     return;
   }
 
   uint64_t temp = imsi;
-  for(int i=14;i>=0;i--)
-  {
+  for(int i=14;i>=0;i--) {
     imsi_[i] = temp % 10;
     temp /= 10;
   }
@@ -126,13 +124,12 @@ void usim::get_imsi_vec(uint8_t* imsi_, uint32_t n)
 
 void usim::get_imei_vec(uint8_t* imei_, uint32_t n)
 {
-  if (!initiated)
-  {
-    usim_log->error("Getting IMEI: USIM not initiated\n");
+  if (!initiated) {
+    fprintf(stderr, "USIM not initiated!\n");
     return;
   }
-  if(NULL == imei_ || n < 15)
-  {
+
+  if(NULL == imei_ || n < 15) {
     usim_log->error("Invalid parameters to get_imei_vec");
     return;
   }
@@ -147,9 +144,8 @@ void usim::get_imei_vec(uint8_t* imei_, uint32_t n)
 
 int usim::get_home_plmn_id(LIBLTE_RRC_PLMN_IDENTITY_STRUCT *home_plmn_id)
 {
-  if (!initiated)
-  {
-    usim_log->error("Getting Home PLMN Id: USIM not initiated\n");
+  if (!initiated) {
+    fprintf(stderr, "USIM not initiated!\n");
     return -1;
   }
 

From 21d9cb61423ec9ce95ff3328adb394c18eeb8c2a Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Thu, 12 Oct 2017 20:52:31 +0200
Subject: [PATCH 3/3] fix UL harq statistic printing

---
 srsue/src/mac/mac.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srsue/src/mac/mac.cc b/srsue/src/mac/mac.cc
index b54ea5be6..04b7c4750 100644
--- a/srsue/src/mac/mac.cc
+++ b/srsue/src/mac/mac.cc
@@ -417,7 +417,7 @@ void mac::get_metrics(mac_metrics_t &m)
        metrics.rx_pkts?((float) 100*metrics.rx_errors/metrics.rx_pkts):0.0, 
        dl_harq.get_average_retx(),
        metrics.tx_pkts?((float) 100*metrics.tx_errors/metrics.tx_pkts):0.0, 
-       dl_harq.get_average_retx());
+       ul_harq.get_average_retx());
   
   metrics.ul_buffer = (int) bsr_procedure.get_buffer_state();
   m = metrics;