From 43082e8d6a321def8383f418d6ef0238c0daf9d4 Mon Sep 17 00:00:00 2001 From: Codebot Date: Wed, 9 Dec 2020 11:04:21 +0100 Subject: [PATCH] enb/ue: turn various warning messages into info turn events that may happen in the normal life of a eNB/UE into info rather than warning to allow strict warning/error checking in tests. --- lib/src/upper/pdcp.cc | 2 +- srsenb/src/stack/rrc/rrc_ue.cc | 3 +-- srsue/src/stack/mac/dl_harq.cc | 10 +++++----- srsue/src/stack/rrc/rrc.cc | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/src/upper/pdcp.cc b/lib/src/upper/pdcp.cc index 933deea15..d12f83f4d 100644 --- a/lib/src/upper/pdcp.cc +++ b/lib/src/upper/pdcp.cc @@ -120,7 +120,7 @@ void pdcp::add_bearer(uint32_t lcid, pdcp_config_t cfg) valid_lcids_cached.insert(lcid); } } else { - pdcp_log->warning("Bearer %s already configured. Reconfiguration not supported\n", rrc->get_rb_name(lcid).c_str()); + pdcp_log->info("Bearer %s already configured.\n", rrc->get_rb_name(lcid).c_str()); } } diff --git a/srsenb/src/stack/rrc/rrc_ue.cc b/srsenb/src/stack/rrc/rrc_ue.cc index 0f76a955e..9cea7794d 100644 --- a/srsenb/src/stack/rrc/rrc_ue.cc +++ b/srsenb/src/stack/rrc/rrc_ue.cc @@ -74,8 +74,7 @@ void rrc::ue::activity_timer_expired() { if (parent) { if (parent->rrc_log) { - parent->rrc_log->warning( - "Activity timer for rnti=0x%x expired after %d ms\n", rnti, activity_timer.time_elapsed()); + parent->rrc_log->info("Activity timer for rnti=0x%x expired after %d ms\n", rnti, activity_timer.time_elapsed()); } if (parent->s1ap->user_exists(rnti)) { diff --git a/srsue/src/stack/mac/dl_harq.cc b/srsue/src/stack/mac/dl_harq.cc index 4be294a33..792133520 100644 --- a/srsue/src/stack/mac/dl_harq.cc +++ b/srsue/src/stack/mac/dl_harq.cc @@ -291,11 +291,11 @@ void dl_harq_entity::dl_harq_process::dl_tb_process::new_grant_dl(mac_interface_ action->tb[tid].rv = cur_grant.tb[tid].rv; action->tb[tid].softbuffer.rx = &softbuffer; } else { - Warning("DL PID %d: Received duplicate TB%d. Discarding and retransmitting ACK (n_retx=%d, reset=%s)\n", - pid, - tid, - n_retx, - n_retx > RESET_DUPLICATE_TIMEOUT ? "yes" : "no"); + Info("DL PID %d: Received duplicate TB%d. Discarding and retransmitting ACK (n_retx=%d, reset=%s)\n", + pid, + tid, + n_retx, + n_retx > RESET_DUPLICATE_TIMEOUT ? "yes" : "no"); if (n_retx > RESET_DUPLICATE_TIMEOUT) { reset(false); } diff --git a/srsue/src/stack/rrc/rrc.cc b/srsue/src/stack/rrc/rrc.cc index 56186195c..d05198511 100644 --- a/srsue/src/stack/rrc/rrc.cc +++ b/srsue/src/stack/rrc/rrc.cc @@ -614,14 +614,14 @@ void rrc::radio_link_failure_process() if (state == RRC_STATE_CONNECTED) { if (security_is_activated) { - rrc_log->warning("Detected Radio-Link Failure with active AS security. Starting ConnectionReestablishment...\n"); + rrc_log->info("Detected Radio-Link Failure with active AS security. Starting ConnectionReestablishment...\n"); start_con_restablishment(reest_cause_e::other_fail); } else { - rrc_log->warning("Detected Radio-Link Failure with AS security deactivated. Going to IDLE...\n"); + rrc_log->info("Detected Radio-Link Failure with AS security deactivated. Going to IDLE...\n"); start_go_idle(); } } else { - rrc_log->warning("Detected Radio-Link Failure while RRC_IDLE. Ignoring it.\n"); + rrc_log->info("Detected Radio-Link Failure while RRC_IDLE. Ignoring it.\n"); } }