Merge branch 'next' into agpl_next

srsran · Apr 28, 2023 · 655a098 · 655a098
2 parents 3a53370 + adc0e2d
commit 655a098
Show file tree

Hide file tree

Showing 52 changed files with 52,931 additions and 16,338 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,7 @@ Change Log for Releases
 =======================
 ## 23.04
   * Introduced configurable s1 connection timer
+  * Updated 4G RRC ASN.1 to Rel 17
   * Added reestablishment support during S1-Handover
   * Added basic support for NSSAI based slicing in UE & gNodeB
   * Updated the RRC to enable srsUE compatibility with new srsgnb

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ srsRAN
 
 [![Build Status](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml)
 [![CodeQL](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml)
-[![Coverity](https://scan.coverity.com/projects/23045/badge.svg)](https://scan.coverity.com/projects/srsran)
+[![Coverity](https://scan.coverity.com/projects/28268/badge.svg)](https://scan.coverity.com/projects/srsran_4g_agpl)
 
 srsRAN is an open source 4G software radio suite developed by [SRS](http://www.srs.io). For 5G RAN, see our new O-RAN CU/DU solution - [srsRAN Project](https://www.github.com/srsran/srsran_project).
 

diff --git a/lib/examples/pdsch_ue.c b/lib/examples/pdsch_ue.c
@@ -642,7 +642,7 @@ int main(int argc, char** argv)
 
 #ifdef ENABLE_GUI
   if (!prog_args.disable_plots) {
-    init_plots(cell);
+    init_plots();
     sleep(1);
   }
 #endif /* ENABLE_GUI */

diff --git a/lib/examples/pssch_ue.c b/lib/examples/pssch_ue.c
@@ -394,7 +394,7 @@ int main(int argc, char** argv)
 
 #ifdef ENABLE_GUI
   if (!prog_args.disable_plots) {
-    init_plots(&pscch);
+    init_plots();
     sleep(1);
   }
 #endif

diff --git a/lib/include/srsran/asn1/asn1_utils.h b/lib/include/srsran/asn1/asn1_utils.h
@@ -141,7 +141,8 @@ class bit_ref_impl
   bit_ref_impl() = default;
   bit_ref_impl(Ptr start_ptr_, uint32_t max_size_) :
     ptr(start_ptr_), start_ptr(start_ptr_), max_ptr(max_size_ + start_ptr_)
-  {}
+  {
+  }
 
   int distance(const bit_ref_impl<Ptr>& other) const;
   int distance(const uint8_t* ref_ptr) const;
@@ -1286,7 +1287,8 @@ struct choice_buffer_base_t {
 
 template <typename... Ts>
 struct choice_buffer_t : public choice_buffer_base_t<static_max<sizeof(alignment_t), sizeof(Ts)...>::value,
-                                                     static_max<alignof(alignment_t), alignof(Ts)...>::value> {};
+                                                     static_max<alignof(alignment_t), alignof(Ts)...>::value> {
+};
 
 using pod_choice_buffer_t = choice_buffer_t<>;
 
@@ -1548,6 +1550,11 @@ struct setup_release_c {
     return c;
   }
 
+  bool operator==(const setup_release_c<T>& other) const
+  {
+    return type_ == other.type_ and (type_ != types::setup or (c == other.c));
+  }
+
 private:
   types type_;
   T     c;
@@ -1654,15 +1661,18 @@ struct base_ie_field : public IEItem {
 
 // ProtocolIE-Field{LAYER-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE{{IEsSetParam}}
 template <class IEsSetParam>
-struct protocol_ie_field_s : public detail::base_ie_field<detail::ie_field_value_item<IEsSetParam> > {};
+struct protocol_ie_field_s : public detail::base_ie_field<detail::ie_field_value_item<IEsSetParam> > {
+};
 
 // ProtocolIE-SingleContainer{LAYER-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE{{IEsSetParam}}
 template <class ies_set_paramT_>
-struct protocol_ie_single_container_s : public protocol_ie_field_s<ies_set_paramT_> {};
+struct protocol_ie_single_container_s : public protocol_ie_field_s<ies_set_paramT_> {
+};
 
 // ProtocolExtensionField{LAYER-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUENCE{{LAYER-PROTOCOL-EXTENSION}}
 template <class ExtensionSetParam>
-struct protocol_ext_field_s : public detail::base_ie_field<detail::ie_field_ext_item<ExtensionSetParam> > {};
+struct protocol_ext_field_s : public detail::base_ie_field<detail::ie_field_ext_item<ExtensionSetParam> > {
+};
 
 namespace detail {