tmp

a5975312 · laurent · d379bbae · a5975312 · a5975312 · a5975312
Commit a5975312 authored Mar 01, 2023 by laurent
25 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -301,7 +301,7 @@ add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)
 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
 add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)
-target_link_libraries(ITTI PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(ITTI PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 # asn1c skeletons have hardcoded this flag to make customized debug logs
 # OAI uses this feature to re-use OAI LOG_I(ASN, ...)
@@ -318,14 +318,14 @@ endif()
 add_library(lte_rrc
    ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg.c
    ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c)
-target_link_libraries(lte_rrc PUBLIC asn1_lte_rrc)
+target_link_libraries(lte_rrc PUBLIC asn1_lte_rrc asn1_ngap)
 target_link_libraries(lte_rrc PRIVATE nr_rrc)
 #NR RRC
 #######
 add_library(nr_rrc ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c)
-target_link_libraries(nr_rrc PUBLIC asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_rrc PUBLIC asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 # S1AP
@@ -415,7 +415,7 @@ add_library(m3ap
  ${M3AP_DIR}/m3ap_ids.c
  ${M3AP_DIR}/m3ap_timers.c
 )
-target_link_libraries(m3ap PUBLIC asn1_m3ap)
+target_link_libraries(m3ap PUBLIC asn1_m3ap asn1_ngap)
 target_link_libraries(m3ap PRIVATE m2ap)
 target_link_libraries(m3ap PRIVATE asn1_nr_rrc asn1_lte_rrc)
 target_include_directories(m3ap PUBLIC "${M3AP_DIR}")
@@ -783,7 +783,7 @@ add_library(UTIL
  ${OPENAIR_DIR}/common/utils/time_meas.c
  ${OPENAIR_DIR}/common/utils/time_stat.c
 )
-target_link_libraries(UTIL PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(UTIL PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 set(SECU_OSA_SRC
  ${OPENAIR2_DIR}/UTIL/OSA/osa_key_deriver.c
@@ -822,7 +822,7 @@ set(SCHED_SRC
  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
 )
 add_library(SCHED_LIB ${SCHED_SRC})
-target_link_libraries(SCHED_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 set(SCHED_NR_SRC
  ${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
@@ -831,7 +831,7 @@ set(SCHED_NR_SRC
  ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
 )
 add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
-target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 set(SCHED_SRC_RU
  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
@@ -839,7 +839,7 @@ set(SCHED_SRC_RU
  ${OPENAIR1_DIR}/SCHED/prach_procedures.c
 )
 add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
-target_link_libraries(SCHED_RU_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_RU_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 set(SCHED_SRC_UE
  ${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
@@ -849,7 +849,7 @@ set(SCHED_SRC_UE
  ${OPENAIR1_DIR}/SCHED_UE/srs_pc.c
 )
 add_library(SCHED_UE_LIB ${SCHED_SRC_UE})
-target_link_libraries(SCHED_UE_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_UE_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 set(SCHED_SRC_NR_UE
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -859,7 +859,7 @@ set(SCHED_SRC_NR_UE
  ${OPENAIR1_DIR}/SCHED_NR_UE/pucch_uci_ue_nr.c
 )
 add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
-target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 # nFAPI
@@ -889,7 +889,7 @@ set(NFAPI_PNF_SRC
  ${NFAPI_DIR}/pnf/src/pnf_p7_interface.c
 )
 add_library(NFAPI_PNF_LIB ${NFAPI_PNF_SRC})
-target_link_libraries(NFAPI_PNF_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(NFAPI_PNF_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 include_directories(${NFAPI_DIR}/pnf/public_inc)
 include_directories(${NFAPI_DIR}/pnf/inc)
@@ -901,7 +901,7 @@ set(NFAPI_VNF_SRC
  ${NFAPI_DIR}/vnf/src/vnf_p7_interface.c
 )
 add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})
-target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 include_directories(${NFAPI_DIR}/vnf/public_inc)
 include_directories(${NFAPI_DIR}/vnf/inc)
@@ -915,7 +915,7 @@ set(NFAPI_USER_SRC
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
 )
 add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
-target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 include_directories(${NFAPI_USER_DIR})
 # Layer 1
@@ -1017,7 +1017,7 @@ add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
 target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
 add_library(coding MODULE ${PHY_TURBOSRC} )
-target_link_libraries(coding PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(coding PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c )
@@ -1276,25 +1276,25 @@ set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_ll
 add_library(PHY_COMMON ${PHY_SRC_COMMON})
 target_link_libraries(PHY_COMMON PRIVATE lte_rrc)
 add_dependencies(PHY_COMMON dfts)
-target_link_libraries(PHY_COMMON PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY_COMMON PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(PHY ${PHY_SRC})
-target_link_libraries(PHY PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(PHY_UE ${PHY_SRC_UE})
-target_link_libraries(PHY_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY_UE PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
-target_link_libraries(PHY_NR_COMMON PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY_NR_COMMON PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY_NR PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(PHY_RU ${PHY_SRC_RU})
-target_link_libraries(PHY_RU PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY_RU PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 #Library for mex functions
 #########################3
@@ -1559,14 +1559,14 @@ set (MISC_NFAPI_LTE
 )
 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})
-target_link_libraries(MISC_NFAPI_LTE_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MISC_NFAPI_LTE_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 set (MISC_NFAPI_NR
 ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
 )
 add_library(MISC_NFAPI_NR_LIB ${MISC_NFAPI_NR})
-target_link_libraries(MISC_NFAPI_NR_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MISC_NFAPI_NR_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(L2
  ${L2_SRC}
@@ -1575,16 +1575,16 @@ add_library(L2
  ${MCE_APP_SRC}
  )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
-target_link_libraries(L2 PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(L2 PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(MAC_NR ${MAC_NR_SRC})
-target_link_libraries(MAC_NR PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MAC_NR PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
-target_link_libraries(MAC_UE_NR PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MAC_UE_NR PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(L2_LTE ${L2_LTE_SRC})
-target_link_libraries(L2_LTE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(L2_LTE PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(L2_NR
  ${L2_NR_SRC}
@@ -1597,13 +1597,13 @@ add_library(e1_if
  ${NR_RRC_DIR}/cucp_cuup_e1ap.c
  )
-target_link_libraries(e1_if PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_f1ap e1ap GTPV1U)
+target_link_libraries(e1_if PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_f1ap e1ap GTPV1U asn1_ngap)
 add_library(e1_pdcp_if
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_e1_api.c
  )
-target_link_libraries(e1_pdcp_if PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(e1_pdcp_if PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap)
@@ -1614,19 +1614,19 @@ add_library(L2_LTE_NR
  ${MCE_APP_SRC}
 )
-target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap nr_rrc)
+target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap nr_rrc asn1_ngap)
 add_library(L2_UE
  ${L2_SRC_UE}
  ${MAC_SRC_UE}
 )
-target_link_libraries(L2_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(L2_UE PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 add_library(L2_UE_LTE_NR
  ${L2_RRC_SRC_UE}
  ${MAC_SRC_UE}
 )
-target_link_libraries(L2_UE_LTE_NR PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(L2_UE_LTE_NR PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 if (NOT ${NOS1})
 target_compile_definitions(L2_UE PUBLIC -DPDCP_USE_NETLINK)
@@ -1636,13 +1636,13 @@ target_link_libraries(L2_UE PRIVATE lte_rrc)
 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
 target_link_libraries(NR_L2_UE PRIVATE f1ap)
-target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_library(MAC_NR_COMMON
            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c
 )
-target_link_libraries(MAC_NR_COMMON PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MAC_NR_COMMON PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 include_directories("${OPENAIR2_DIR}/NR_UE_PHY_INTERFACE")
 include_directories("${OPENAIR2_DIR}/LAYER2")
@@ -1660,7 +1660,7 @@ add_library (GTPV1U
  ${RRC_DIR}/rrc_eNB_GTPV1U.c
  ${OPENAIR3_DIR}/ocp-gtpu/gtp_itf.cpp
  )
-target_link_libraries(GTPV1U PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(GTPV1U PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 target_link_libraries(GTPV1U PRIVATE SIMU)
 include_directories(${OPENAIR3_DIR}/ocp-gtp)
@@ -1670,7 +1670,7 @@ set (MME_APP_SRC
 )
 add_library(MME_APP ${MME_APP_SRC})
 target_link_libraries(MME_APP PRIVATE m2ap m3ap)
-target_link_libraries(MME_APP PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MME_APP PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 set(SCTP_SRC
  ${OPENAIR3_DIR}/SCTP/sctp_common.c
@@ -1678,7 +1678,7 @@ set(SCTP_SRC
  ${OPENAIR3_DIR}/SCTP/sctp_eNB_itti_messaging.c
 )
 add_library(SCTP_CLIENT ${SCTP_SRC})
-target_link_libraries(SCTP_CLIENT PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCTP_CLIENT PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
 set(libnas_api_OBJS
@@ -1960,7 +1960,7 @@ target_link_libraries(LIB_NAS_SIMUE PRIVATE lte_rrc)
 set(NAS_SIM_LIB LIB_NAS_SIMUE)
-target_link_libraries(LIB_NAS_SIMUE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(LIB_NAS_SIMUE PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_library(LIB_NAS_UE
  ${NAS_SRC}UE/nas_itti_messaging.c
@@ -1983,7 +1983,7 @@ add_library(LIB_NAS_UE
 target_include_directories(LIB_NAS_UE PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
 target_link_libraries(LIB_NAS_UE PRIVATE lte_rrc)
 set(NAS_UE_LIB LIB_NAS_UE)
-target_link_libraries(LIB_NAS_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(LIB_NAS_UE PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 include_directories(${NAS_SRC}NR_UE)
 include_directories(${NAS_SRC}UE)
@@ -2015,7 +2015,7 @@ add_library(LIB_5GNAS_GNB
 target_include_directories(LIB_5GNAS_GNB PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
 target_link_libraries(LIB_5GNAS_GNB PRIVATE SECU_CN ${CRYPTO_LIBRARIES})
-target_link_libraries(LIB_5GNAS_GNB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(LIB_5GNAS_GNB PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 # Simulation library
 ##########################
@@ -2034,7 +2034,7 @@ set (SIMUSRC
 )
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
-target_link_libraries(SIMU PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SIMU PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 # Qt-based scope
 add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
@@ -2046,7 +2046,7 @@ if (ENABLE_NRQTSCOPE)
  qt5_wrap_cpp(QTSCOPE_SOURCE_NR ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.h)
  add_library(nrqtscope MODULE ${QTSCOPE_SOURCE_NR})
  target_link_libraries(nrqtscope PRIVATE Qt5::Widgets Qt5::Charts)
-  target_link_libraries(nrqtscope PRIVATE asn1_nr_rrc asn1_lte_rrc)
+  target_link_libraries(nrqtscope PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 endif()
 add_library(SIMU_ETH
@@ -2073,7 +2073,7 @@ add_library(rfsimulator MODULE
  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
 	)
 target_link_libraries(rfsimulator PRIVATE SIMU ${ATLAS_LIBRARIES})
-target_link_libraries(rfsimulator PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(rfsimulator PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_library(oai_iqplayer MODULE
 	${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c
@@ -2189,7 +2189,7 @@ target_link_libraries(lte-softmodem PRIVATE
 target_link_libraries(lte-softmodem PRIVATE ${LIBXML2_LIBRARIES})
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
-target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_executable(oairu
@@ -2211,7 +2211,7 @@ target_link_libraries(oairu PRIVATE
  -Wl,--end-group z dl)
 target_link_libraries(oairu PRIVATE pthread m CONFIG_LIB rt ${T_LIB})
-target_link_libraries(oairu PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(oairu PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-softmodem PRIVATE
@@ -2255,7 +2255,7 @@ target_link_libraries(lte-uesoftmodem PRIVATE
 target_link_libraries(lte-uesoftmodem PRIVATE ${LIBXML2_LIBRARIES})
 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${ATLAS_LIBRARIES})
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
-target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-uesoftmodem PRIVATE
@@ -2298,7 +2298,7 @@ target_link_libraries(nr-softmodem PRIVATE
 target_link_libraries(nr-softmodem PRIVATE ${LIBXML2_LIBRARIES})
 target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${ATLAS_LIBRARIES})
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
-target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
@@ -2327,7 +2327,7 @@ target_link_libraries(nr-cuup PRIVATE
                      CONFIG_LIB ITTI SCTP_CLIENT
                      GTPV1U e1ap e1_pdcp_if f1ap
                      SECU_OSA SECU_CN ${OPENSSL_LIBRARIES} crypt z sctp dl pthread)
-target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc asn1_nr_rrc)
+target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc asn1_nr_rrc  asn1_ngap)
 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2363,7 +2363,7 @@ target_link_libraries(nr-uesoftmodem PRIVATE
 target_link_libraries(nr-uesoftmodem PRIVATE ${LIBXML2_LIBRARIES})
 target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${ATLAS_LIBRARIES})
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
-target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
 if (ENABLE_LDPC_CUDA)
@@ -2402,7 +2402,7 @@ add_executable(rftest
  ${SHLIB_LOADER_SOURCES}
 )
 target_link_libraries(rftest PRIVATE minimal_lib CONFIG_LIB PHY_NR_COMMON UTIL pthread dl m ${T_LIB} )
-target_link_libraries(rftest PRIVATE asn1_lte_rrc asn1_nr_rrc)
+target_link_libraries(rftest PRIVATE asn1_lte_rrc asn1_nr_rrc  asn1_ngap)
 add_executable(polartest
  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c
@@ -2414,7 +2414,7 @@ target_link_libraries(polartest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_COMMON PHY_NR_UE CONFIG_LIB -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} dl
  )
-target_link_libraries(polartest PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(polartest PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_executable(smallblocktest
  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/smallblocktest.c
@@ -2427,7 +2427,7 @@ target_link_libraries(smallblocktest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_NR PHY_COMMON PHY_NR_COMMON CONFIG_LIB -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} dl
 )
-target_link_libraries(smallblocktest PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(smallblocktest PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_executable(ldpctest
@@ -2445,7 +2445,7 @@ target_link_libraries(ldpctest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_NR PHY_COMMON PHY_NR_COMMON CONFIG_LIB -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} dl
  )
-target_link_libraries(ldpctest PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(ldpctest PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_executable(nr_dlschsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
@@ -2458,7 +2458,7 @@ target_link_libraries(nr_dlschsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
  )
-target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_executable(nr_pbchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c
@@ -2470,7 +2470,7 @@ target_link_libraries(nr_pbchsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
 )
-target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 #PUCCH ---> Prashanth
@@ -2485,7 +2485,7 @@ target_link_libraries(nr_pucchsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
 )
-target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_executable(nr_dlsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
@@ -2503,7 +2503,7 @@ target_link_libraries(nr_dlsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON lte_rrc nr_rrc CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE x2ap SECU_CN ngap NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB -lz -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl
  )
-target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_executable(nr_prachsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c
@@ -2518,7 +2518,7 @@ add_executable(nr_prachsim
 target_link_libraries(nr_prachsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON lte_rrc nr_rrc CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE x2ap SECU_CN ngap NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB -lz -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl)
-target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_executable(nr_ulschsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
@@ -2532,7 +2532,7 @@ target_link_libraries(nr_ulschsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
 )
-target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 add_executable(nr_ulsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
@@ -2555,7 +2555,7 @@ target_link_libraries(nr_ulsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON lte_rrc nr_rrc CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE x2ap SECU_CN ngap NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB -lz -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl
  )
-target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
@@ -2572,7 +2572,7 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
    -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_NR_COMMON PHY PHY_UE PHY_RU ITTI -Wl,--end-group
    pthread m rt CONFIG_LIB ${ATLAS_LIBRARIES} ${T_LIB} dl
    )
-  target_link_libraries(${myExe} PRIVATE asn1_nr_rrc asn1_lte_rrc)
+  target_link_libraries(${myExe} PRIVATE asn1_nr_rrc asn1_lte_rrc  asn1_ngap)
 endforeach(myExe)

--- a/common/ngran_types.h
+++ b/common/ngran_types.h
@@ -54,4 +54,7 @@ typedef enum { CPtype = 0, UPtype } E1_t;
 #define NODE_IS_DU(nOdE_TyPe)         ((nOdE_TyPe) == ngran_eNB_DU || (nOdE_TyPe) == ngran_gNB_DU)
 #define NODE_IS_MBMS(nOdE_TyPe)       ((nOdE_TyPe) == ngran_eNB_MBMS_STA)
 #define GTPV1_U_PORT_NUMBER (2152)
+typedef enum { non_dynamic, dynamic } fiveQI_type_t;
+#define maxSRBs 4
 #endif
--- a/openair2/COMMON/e1ap_messages_types.h
+++ b/openair2/COMMON/e1ap_messages_types.h
@@ -24,6 +24,7 @@
 #ifndef E1AP_MESSAGES_TYPES_H
 #define E1AP_MESSAGES_TYPES_H
+#include "common/ngran_types.h"
 #include "f1ap_messages_types.h"
 #include "ngap_messages_types.h"

--- a/openair2/COMMON/ngap_messages_types.h
+++ b/openair2/COMMON/ngap_messages_types.h
@@ -29,8 +29,9 @@
 #ifndef NGAP_MESSAGES_TYPES_H_
 #define NGAP_MESSAGES_TYPES_H_
+#include "common/ngran_types.h"
 #include "LTE_asn_constant.h"
+#include "NGAP_Cause.h"
 //-------------------------------------------------------------------------------------------//
 // Defines to access message fields.
@@ -49,7 +50,7 @@
 #define NGAP_UE_CTXT_MODIFICATION_RESP(mSGpTR)  (mSGpTR)->ittiMsg.ngap_ue_ctxt_modification_resp
 #define NGAP_UE_CTXT_MODIFICATION_FAIL(mSGpTR)  (mSGpTR)->ittiMsg.ngap_ue_ctxt_modification_fail
 #define NGAP_PDUSESSION_SETUP_RESP(mSGpTR)           (mSGpTR)->ittiMsg.ngap_pdusession_setup_resp
-#define NGAP_PDUSESSION_SETUP_FAIL(mSGpTR)           (mSGpTR)->ittiMsg.ngap_pdusession_setup_req_fail
+#define NGAP_PDUSESSION_SETUP_FAIL(mSGpTR) (mSGpTR)->ittiMsg.ngap_pdusession_setup_request_fail
 #define NGAP_PDUSESSION_MODIFY_RESP(mSGpTR)           (mSGpTR)->ittiMsg.ngap_pdusession_modify_resp
 #define NGAP_PATH_SWITCH_REQ(mSGpTR)            (mSGpTR)->ittiMsg.ngap_path_switch_req
 #define NGAP_PATH_SWITCH_REQ_ACK(mSGpTR)        (mSGpTR)->ittiMsg.ngap_path_switch_req_ack
@@ -194,6 +195,13 @@ typedef enum ngap_rrc_establishment_cause_e {
  NGAP_RRC_CAUSE_LAST
 } ngap_rrc_establishment_cause_t;
+typedef struct pdusession_level_qos_parameter_s {
+  uint8_t qfi;
+  uint64_t fiveQI;
+  fiveQI_type_t fiveQI_type;
+  ngap_allocation_retention_priority_t allocation_retention_priority;
+} pdusession_level_qos_parameter_t;
 typedef struct ngap_guami_s {
  uint16_t mcc;
  uint16_t mnc;
@@ -242,7 +250,7 @@ typedef struct ngap_nas_pdu_s {
  uint8_t  *buffer;
  /* Length of the octet string */
  uint32_t  length;
-} ngap_nas_pdu_t, ngap_ue_radio_cap_t;
+} ngap_pdu_t;
 typedef struct ngap_mobility_restriction_s{
  ngap_plmn_identity_t serving_plmn;
@@ -267,43 +275,22 @@ typedef struct ngap_transport_layer_addr_s {
  uint8_t buffer[20]; // in network byte order
 } ngap_transport_layer_addr_t;
-#define TRANSPORT_LAYER_ADDR_COPY(dEST,sOURCE)        \
-  do {                                                \
-      AssertFatal(sOURCE.len <= 20);                  \
-      memcpy(dEST.buffer, sOURCE.buffer, sOURCE.len); \
-      dEST.length = sOURCE.length;                    \
-  } while (0)
-typedef enum {
-  non_dynamic,
-  dynamic
-} fiveQI_type_t;
-typedef struct pdusession_level_qos_parameter_s {
-  uint8_t  qfi;
-  uint64_t fiveQI;
-  fiveQI_type_t fiveQI_type;
-  ngap_allocation_retention_priority_t allocation_retention_priority;
-} pdusession_level_qos_parameter_t;
 typedef struct pdusession_s {
  /* Unique pdusession_id for the UE. */
-  uint8_t                          pdusession_id;
+  int pdusession_id;
+  ngap_pdu_t nas_pdu;
-  uint8_t                          nb_qos;
+  ngap_pdu_t pdusessionTransfer;
+  uint8_t nb_qos;
  /* Quality of service for this pdusession */
  pdusession_level_qos_parameter_t qos[QOSFLOW_MAX_VALUE];
-  /* The NAS PDU should be forwarded by the RRC layer to the NAS layer */
-  ngap_nas_pdu_t                   nas_pdu;
  /* The transport layer address for the IP packets */
-  ngap_transport_layer_addr_t      upf_addr;
+  ngap_transport_layer_addr_t upf_addr;
  /* S-GW Tunnel endpoint identifier */
-  uint32_t                         gtp_teid;
+  uint32_t gtp_teid;
  /* Stores the DRB ID of the DRBs used by this PDU Session */
-  uint8_t                          used_drbs[NGAP_MAX_DRBS_PER_UE];
+  uint8_t used_drbs[NGAP_MAX_DRBS_PER_UE];
 } pdusession_t;
 typedef enum pdusession_qosflow_mapping_ind_e{
  QOSFLOW_MAPPING_INDICATION_UL = 0,
  QOSFLOW_MAPPING_INDICATION_DL = 1,
@@ -332,20 +319,6 @@ typedef struct pdusession_setup_s {
  pdusession_associate_qosflow_t associated_qos_flows[QOSFLOW_MAX_VALUE];
 } pdusession_setup_t;
-typedef struct pdusession_tobe_added_s {
-  /* Unique pdusession_id for the UE. */
-  uint8_t pdusession_id;
-  /* Unique drb_ID for the UE. */
-  uint8_t drb_ID;
-  /* The transport layer address for the IP packets */
-  ngap_transport_layer_addr_t upf_addr;
-  /* S-GW Tunnel endpoint identifier */
-  uint32_t gtp_teid;
-} pdusession_tobe_added_t;
 typedef struct pdusession_admitted_tobe_added_s {
  /* Unique pdusession_id for the UE. */
  uint8_t pdusession_id;
@@ -454,7 +427,7 @@ typedef struct pdusession_failed_s {
  uint8_t pdusession_id;
  /* Cause of the failure */
  //     cause_t cause;
-  ngap_Cause_t cause;
+  NGAP_Cause_PR cause;
  uint8_t cause_value;
 } pdusession_failed_t;
@@ -541,7 +514,7 @@ typedef struct ngap_deregistered_gnb_ind_s {
 */
 typedef struct ngap_nas_first_req_s {
  /* UE id for initial connection to NGAP */
-  uint16_t ue_initial_id;
+  uint32_t gNB_ue_ngap_id;
  /* the chosen PLMN identity as index, see TS 36.331 6.2.2 RRC Connection
   * Setup Complete. This index here is zero-based, unlike the standard! */
@@ -551,7 +524,7 @@ typedef struct ngap_nas_first_req_s {
  ngap_rrc_establishment_cause_t establishment_cause;
  /* NAS PDU */
-  ngap_nas_pdu_t nas_pdu;
+  ngap_pdu_t nas_pdu;
  /* If this flag is set NGAP layer is expecting the GUAMI. If = 0,
   * the temporary s-tmsi is used.
@@ -561,15 +534,14 @@ typedef struct ngap_nas_first_req_s {
 typedef struct ngap_uplink_nas_s {
  /* Unique UE identifier within an gNB */
-  uint32_t  gNB_ue_ngap_id;
+  uint32_t gNB_ue_ngap_id;
  /* NAS pdu */
-  ngap_nas_pdu_t nas_pdu;
+  ngap_pdu_t nas_pdu;
 } ngap_uplink_nas_t;
 typedef struct ngap_ue_cap_info_ind_s {
  uint32_t  gNB_ue_ngap_id;
-  ngap_ue_radio_cap_t ue_radio_cap;
+  ngap_pdu_t ue_radio_cap;
 } ngap_ue_cap_info_ind_t;
 typedef struct ngap_initial_context_setup_resp_s {
@@ -594,7 +566,7 @@ typedef struct ngap_initial_context_setup_fail_s {
 typedef struct ngap_nas_non_delivery_ind_s {
  uint32_t     gNB_ue_ngap_id;
-  ngap_nas_pdu_t nas_pdu;
+  ngap_pdu_t nas_pdu;
  /* TODO: add cause */
 } ngap_nas_non_delivery_ind_t;
@@ -621,30 +593,21 @@ typedef struct ngap_ue_ctxt_modification_resp_s {
 } ngap_ue_ctxt_modification_resp_t;
 typedef struct ngap_ue_release_complete_s {
  uint32_t gNB_ue_ngap_id;
 } ngap_ue_release_complete_t;
 //-------------------------------------------------------------------------------------------//
 // NGAP -> RRC messages
 typedef struct ngap_downlink_nas_s {
  /* UE id for initial connection to NGAP */
-  uint16_t     ue_initial_id;
+  uint32_t gNB_ue_ngap_id;
-  /* Unique UE identifier within an gNB */
-  uint32_t     gNB_ue_ngap_id;
  /* NAS pdu */
-  ngap_nas_pdu_t nas_pdu;
+  ngap_pdu_t nas_pdu;
 } ngap_downlink_nas_t;
 typedef struct ngap_initial_context_setup_req_s {
  /* UE id for initial connection to NGAP */
-  uint16_t ue_initial_id;
-  /* gNB ue ngap id as initialized by NGAP layer */
  uint32_t gNB_ue_ngap_id;
  uint64_t amf_ue_ngap_id:40;
@@ -676,7 +639,7 @@ typedef struct ngap_initial_context_setup_req_s {
  /* Nas Pdu */
  uint8_t                        nas_pdu_flag;
-  ngap_nas_pdu_t                 nas_pdu;
+  ngap_pdu_t nas_pdu;
 } ngap_initial_context_setup_req_t;
@@ -704,14 +667,11 @@ typedef struct ngap_paging_ind_s {
 typedef struct ngap_pdusession_setup_req_s {
  /* UE id for initial connection to NGAP */
-  uint16_t ue_initial_id;
+  uint32_t gNB_ue_ngap_id;
  /* AMF UE id  */
  uint64_t amf_ue_ngap_id:40;
-  /* gNB ue ngap id as initialized by NGAP layer */
-  uint32_t  gNB_ue_ngap_id;
  /* S-NSSAI */
  ngap_allowed_NSSAI_t allowed_nssai[8];
@@ -730,8 +690,7 @@ typedef struct ngap_pdusession_setup_req_s {
 } ngap_pdusession_setup_req_t;
 typedef struct ngap_pdusession_setup_resp_s {
-  uint32_t      gNB_ue_ngap_id;
+  uint32_t gNB_ue_ngap_id;
  /* Number of pdusession setup-ed in the list */
  uint8_t       nb_of_pdusessions;
  /* list of pdusession setup-ed by RRC layers */
@@ -744,7 +703,6 @@ typedef struct ngap_pdusession_setup_resp_s {
 } ngap_pdusession_setup_resp_t;
 typedef struct ngap_path_switch_req_s {
  uint32_t  gNB_ue_ngap_id;
  /* Number of pdusession setup-ed in the list */
@@ -759,8 +717,7 @@ typedef struct ngap_path_switch_req_s {
  ngap_guami_t ue_guami;
  uint16_t ue_initial_id;
+  /* Security algorithms */
-   /* Security algorithms */
  ngap_security_capabilities_t security_capabilities;
 } ngap_path_switch_req_t;
@@ -830,10 +787,7 @@ typedef struct ngap_ue_release_command_s {
 typedef struct pdusession_release_s {
  /* Unique pdusession_id for the UE. */
  uint8_t                     pdusession_id;
-  /* Octet string data */
+  ngap_pdu_t data;
-  uint8_t  *transfer_buffer;
-  /* Length of the octet string */
-  uint32_t  transfer_length;
 } pdusession_release_t;
 typedef struct ngap_ue_release_req_s {
@@ -842,14 +796,11 @@ typedef struct ngap_ue_release_req_s {
  uint8_t              nb_of_pdusessions;
  /* list of pdusession resource by RRC layers */
  pdusession_release_t pdusessions[NGAP_MAX_PDUSESSION];
-  ngap_Cause_t         cause;
+  NGAP_Cause_PR cause;
  long                 cause_value;
 } ngap_ue_release_req_t, ngap_ue_release_resp_t;
 typedef struct ngap_pdusession_modify_req_s {
-  /* UE id for initial connection to NGAP */
-  uint16_t ue_initial_id;
  /* AMF UE id  */
  uint64_t amf_ue_ngap_id:40;
@@ -885,7 +836,7 @@ typedef struct ngap_pdusession_release_command_s {
  uint32_t                       gNB_ue_ngap_id;
  /* The NAS PDU should be forwarded by the RRC layer to the NAS layer */
-  ngap_nas_pdu_t                 nas_pdu;
+  ngap_pdu_t nas_pdu;
  /* Number of pdusession to be released in the list */
  uint8_t                        nb_pdusessions_torelease;

--- a/openair2/E1AP/CMakeLists.txt
+++ b/openair2/E1AP/CMakeLists.txt
@@ -3,5 +3,5 @@ add_subdirectory(MESSAGES)
 add_library(e1ap e1ap.c e1ap_common.c e1ap_api.c)
 target_link_libraries(e1ap
                      PUBLIC asn1_e1ap f1ap
-                      PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_f1ap UTIL e1_pdcp_if e1_if)
+                      PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_f1ap UTIL e1_pdcp_if e1_if asn1_ngap)
 target_include_directories(e1ap PUBLIC ${CMAKE_CURRENT_DIR})
--- a/openair2/RRC/NR/cucp_cuup_direct.c
+++ b/openair2/RRC/NR/cucp_cuup_direct.c
@@ -107,17 +107,17 @@ static int drb_config_gtpu_create(const protocol_ctxt_t *const ctxt_p,
  gtpv1u_gnb_create_tunnel_req_t  create_tunnel_req={0};
  gtpv1u_gnb_create_tunnel_resp_t create_tunnel_resp={0};
+  LOG_W(NR_RRC, "recreate existing tunnels, while adding new ones\n");
-  int i = ue_context_p->ue_context.nb_of_pdusessions - 1;
+  for (int i = 0; i < ue_context_p->ue_context.nb_of_pdusessions; i++) {
-  pdu_session_param_t *pdu = ue_context_p->ue_context.pduSession + i;
+    rrc_pdu_session_param_t *pdu = ue_context_p->ue_context.pduSession + i;
-  create_tunnel_req.pdusession_id[0] = pdu->param.pdusession_id;
+    create_tunnel_req.pdusession_id[i] = pdu->param.pdusession_id;
-  create_tunnel_req.incoming_rb_id[0] = i + 1;
+    create_tunnel_req.incoming_rb_id[i] = i + 1;
-  create_tunnel_req.outgoing_qfi[0] = req->pduSession[i].DRBnGRanList[0].qosFlows[0].id;
+    create_tunnel_req.outgoing_qfi[i] = req->pduSession[i].DRBnGRanList[0].qosFlows[0].id;
-  memcpy(&create_tunnel_req.dst_addr[0].buffer, &pdu->param.upf_addr.buffer, sizeof(create_tunnel_req.dst_addr[0].buffer));
+    memcpy(&create_tunnel_req.dst_addr[i].buffer, &pdu->param.upf_addr.buffer, sizeof(create_tunnel_req.dst_addr[0].buffer));
-  create_tunnel_req.dst_addr[0].length = pdu->param.upf_addr.length;
+    create_tunnel_req.dst_addr[i].length = pdu->param.upf_addr.length;
-  create_tunnel_req.outgoing_teid[0] = pdu->param.gtp_teid;
+    create_tunnel_req.outgoing_teid[i] = pdu->param.gtp_teid;
+  }
-  create_tunnel_req.num_tunnels = 1;
+  create_tunnel_req.num_tunnels = ue_context_p->ue_context.nb_of_pdusessions;
  create_tunnel_req.ue_id = ue_context_p->ue_context.rnti;
  int ret = gtpv1u_create_ngu_tunnel(getCxtE1(instance)->gtpInstN3, &create_tunnel_req, &create_tunnel_resp);
@@ -127,7 +127,7 @@ static int drb_config_gtpu_create(const protocol_ctxt_t *const ctxt_p,
    return ret;
  }
-  nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(ctxt_p, &create_tunnel_resp, i);
+  nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(ctxt_p, &create_tunnel_resp, 0);
  uint8_t *kRRCenc = NULL;
  uint8_t *kRRCint = NULL;

--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -267,9 +267,12 @@ typedef struct pdu_session_param_s {
  pdusession_t param;
  uint8_t status;
  uint8_t xid; // transaction_id
-  ngap_Cause_t cause;
+  NGAP_Cause_PR cause;
  uint8_t cause_value;
-} __attribute__ ((__packed__)) pdu_session_param_t;
+  ngap_pdu_t nas_pdu;
+  ngap_pdu_t pdusessionTransfer;
+} rrc_pdu_session_param_t;
 typedef struct gNB_RRC_UE_s {
  uint8_t                            primaryCC_id;
@@ -281,8 +284,7 @@ typedef struct gNB_RRC_UE_s {
  uint8_t                            DRB_active[NGAP_MAX_DRBS_PER_UE];
  NR_SRB_INFO                       SI;
-  NR_SRB_INFO_TABLE_ENTRY           Srb1;
+  NR_SRB_INFO_TABLE_ENTRY Srb[maxSRBs]; // 3gpp max is 3 SRBs, number 1..3, we waste the entry 0 for code simplicity
-  NR_SRB_INFO_TABLE_ENTRY           Srb2;
  NR_MeasConfig_t                   *measConfig;
  NR_HANDOVER_INFO                  *handover_info;
  NR_MeasResults_t                  *measResults;
@@ -350,11 +352,11 @@ typedef struct gNB_RRC_UE_s {
  /* Number of e_rab to be modified in the list */
  uint8_t                            nb_of_modify_pdusessions;
  uint8_t                            nb_of_failed_pdusessions;
-  pdu_session_param_t                modify_pdusession[NR_NB_RB_MAX];
+  rrc_pdu_session_param_t modify_pdusession[NR_NB_RB_MAX];
  /* list of e_rab to be setup by RRC layers */
  /* list of pdu session to be setup by RRC layers */
  nr_e_rab_param_t                   e_rab[NB_RB_MAX];//[S1AP_MAX_E_RAB];
-  pdu_session_param_t                pduSession[NGAP_MAX_PDU_SESSION];
+  rrc_pdu_session_param_t pduSession[NGAP_MAX_PDU_SESSION];
  //release e_rabs
  uint8_t                            nb_release_of_e_rabs;
  e_rab_failed_t                     e_rabs_release_failed[S1AP_MAX_E_RAB];
@@ -395,8 +397,7 @@ typedef struct gNB_RRC_UE_s {
  struct NR_PhysicalCellGroupConfig                     *physicalCellGroupConfig;
  /* Nas Pdu */
-  uint8_t                        nas_pdu_flag;
+  ngap_pdu_t nas_pdu;
-  ngap_nas_pdu_t                 nas_pdu;
 } gNB_RRC_UE_t;
@@ -492,12 +493,7 @@ typedef struct gNB_RRC_INST_s {
  rrc_gNB_carrier_data_t                              carrier;
  uid_allocator_t                                     uid_allocator;
  RB_HEAD(rrc_nr_ue_tree_s, rrc_gNB_ue_context_s)     rrc_ue_head; // ue_context tree key search by rnti
-  int                                                 Nb_ue;
+  int Nb_ue;
-  hash_table_t                                        *initial_id2_s1ap_ids; // key is    content is rrc_ue_s1ap_ids_t
-  hash_table_t                                        *s1ap_id2_s1ap_ids   ; // key is    content is rrc_ue_s1ap_ids_t
-  hash_table_t                                        *initial_id2_ngap_ids;
-  hash_table_t                                        *ngap_id2_ngap_ids   ;
  /// NR cell id
  uint64_t nr_cellid;

--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -248,10 +248,6 @@ static void openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_Rrc
  rrc_gNB_CU_DU_init(rrc);
  uid_linear_allocator_init(&rrc->uid_allocator);
  RB_INIT(&rrc->rrc_ue_head);
-  rrc->initial_id2_s1ap_ids = hashtable_create (NUMBER_OF_UE_MAX * 2, NULL, NULL);
-  rrc->s1ap_id2_s1ap_ids    = hashtable_create (NUMBER_OF_UE_MAX * 2, NULL, NULL);
-  rrc->initial_id2_ngap_ids = hashtable_create (NUMBER_OF_UE_MAX * 2, NULL, NULL);
-  rrc->ngap_id2_ngap_ids    = hashtable_create (NUMBER_OF_UE_MAX * 2, NULL, NULL);
  rrc->configuration = *configuration;
  rrc->carrier.servingcellconfigcommon = configuration->scc;
  rrc->carrier.servingcellconfig = configuration->scd;
@@ -512,9 +508,9 @@ static void rrc_gNB_process_RRCSetupComplete(const protocol_ctxt_t *const ctxt_p
 {
  LOG_A(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel UL-DCCH, " "processing NR_RRCSetupComplete from UE (SRB1 Active)\n",
      PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
-  ue_context_pP->ue_context.Srb1.Active = 1;
+  ue_context_pP->ue_context.Srb[1].Active = 1;
-  ue_context_pP->ue_context.Srb1.Srb_info.Srb_id = 1;
+  ue_context_pP->ue_context.Srb[1].Srb_info.Srb_id = 1;
-  ue_context_pP->ue_context.Srb2.Active = 0;
+  ue_context_pP->ue_context.Srb[2].Active = 0;
  ue_context_pP->ue_context.StatusRrc = NR_RRC_CONNECTED;
  if (get_softmodem_params()->sa) {
@@ -553,7 +549,7 @@ static void rrc_gNB_generate_defaultRRCReconfiguration(const protocol_ctxt_t *co
          i, ue_context_pP->ue_context.pduSession[i].status, "PDU_SESSION_STATUS_DONE");
  }
-  if (ue_context_pP->ue_context.nas_pdu_flag == 1) {
+  if (ue_context_pP->ue_context.nas_pdu.length) {
    dedicatedNAS_Message = CALLOC(1, sizeof(NR_DedicatedNAS_Message_t));
    OCTET_STRING_fromBuf(dedicatedNAS_Message,
                          (char *)ue_context_pP->ue_context.nas_pdu.buffer,
@@ -1281,15 +1277,12 @@ rrc_gNB_process_RRCReconfigurationComplete(
  if (SRB_configList != NULL) {
    for (int i = 0; (i < SRB_configList->list.count) && (i < 3); i++) {
      if (SRB_configList->list.array[i]->srb_Identity == 1) {
-        ue_context_pP->ue_context.Srb1.Active = 1;
+        ue_context_pP->ue_context.Srb[1].Active = 1;
-        ue_context_pP->ue_context.Srb1.Srb_info.Srb_id = 1;
+        ue_context_pP->ue_context.Srb[1].Srb_info.Srb_id = 1;
      } else if (SRB_configList->list.array[i]->srb_Identity == 2) {
-        ue_context_pP->ue_context.Srb2.Active = 1;
+        ue_context_pP->ue_context.Srb[2].Active = 1;
-        ue_context_pP->ue_context.Srb2.Srb_info.Srb_id = 2;
+        ue_context_pP->ue_context.Srb[2].Srb_info.Srb_id = 2;
-        LOG_I(NR_RRC,"[gNB %d] Frame %d CC %d: SRB2 is now active\n",
+        LOG_I(NR_RRC, "[gNB %d] Frame      %d CC %d : SRB2 is now active\n", ctxt_pP->module_id, ctxt_pP->frame, ue_context_pP->ue_context.primaryCC_id);
-              ctxt_pP->module_id,
-              ctxt_pP->frame,
-              ue_context_pP->ue_context.primaryCC_id);
      } else {
        LOG_W(NR_RRC,"[gNB %d] Frame %d CC %d: invalid SRB identity %ld\n",
              ctxt_pP->module_id,
@@ -1554,33 +1547,17 @@ void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *const ctx
    }
  }
-  ue_context_pP->ue_context.Srb1.Active = 1;
+  ue_context_pP->ue_context.Srb[1].Active = 1;
-  //ue_context_pP->ue_context.Srb2.Srb_info.Srb_id = 2;
+  // ue_context_pP->ue_context.Srb[2].Srb_info.Srb_id = 2;
  if (get_softmodem_params()->sa) {
    hashtable_rc_t    h_rc;
-    int               j;
+    int j;
-    rrc_ue_ngap_ids_t *rrc_ue_ngap_ids_p = NULL;
    uint16_t ue_initial_id = ue_context_pP->ue_context.ue_initial_id;
    uint32_t gNB_ue_ngap_id = ue_context_pP->ue_context.gNB_ue_ngap_id;
    gNB_RRC_INST *rrc_instance_p = RC.nrrrc[GNB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)];
-    if (gNB_ue_ngap_id > 0) {
+    AssertFatal(false, "rework identity mapping \n");
-      h_rc = hashtable_get(rrc_instance_p->ngap_id2_ngap_ids, (hash_key_t)gNB_ue_ngap_id, (void **)&rrc_ue_ngap_ids_p);
-      if  (h_rc == HASH_TABLE_OK) {
-        rrc_ue_ngap_ids_p->ue_rnti = ctxt_pP->rntiMaybeUEid;
-      }
-    }
-    if (ue_initial_id != 0) {
-      h_rc = hashtable_get(rrc_instance_p->initial_id2_ngap_ids, (hash_key_t)ue_initial_id, (void **)&rrc_ue_ngap_ids_p);
-      if  (h_rc == HASH_TABLE_OK) {
-        rrc_ue_ngap_ids_p->ue_rnti = ctxt_pP->rntiMaybeUEid;
-      }
-    }
    gtpv1u_gnb_create_tunnel_req_t  create_tunnel_req={0};
    /* Save e RAB information for later */
@@ -1608,23 +1585,25 @@ void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *const ctx
    if ( ret != 0 ) {
      LOG_E(NR_RRC,"gtpv1u_update_ngu_tunnel failed,start to release UE %x\n",reestablish_rnti);
+      AssertFatal(false, "\n");
+      /*
      // update s1u tunnel failed,reset rnti?
      if (gNB_ue_ngap_id > 0) {
-        h_rc = hashtable_get(rrc_instance_p->ngap_id2_ngap_ids, (hash_key_t)gNB_ue_ngap_id, (void **)&rrc_ue_ngap_ids_p);
+      h_rc = hashtable_get(rrc_instance_p->ngap_id2_ngap_ids, (hash_key_t)gNB_ue_ngap_id, (void **)&rrc_ue_ngap_ids_p);
-        if (h_rc == HASH_TABLE_OK ) {
+      if (h_rc == HASH_TABLE_OK ) {
-        	rrc_ue_ngap_ids_p->ue_rnti = reestablish_rnti;
+      rrc_ue_ngap_ids_p->ue_rnti = reestablish_rnti;
-        }
+      }
      }
      if (ue_initial_id != 0) {
        h_rc = hashtable_get(rrc_instance_p->initial_id2_ngap_ids, (hash_key_t)ue_initial_id, (void **)&rrc_ue_ngap_ids_p);
-        if (h_rc == HASH_TABLE_OK ) {
+if (h_rc == HASH_TABLE_OK ) {
          rrc_ue_ngap_ids_p->ue_rnti = reestablish_rnti;
        }
      }
+      */
      ue_context_pP->ue_context.ue_release_timer_s1 = 1;
      ue_context_pP->ue_context.ue_release_timer_thres_s1 = 100;
@@ -1637,8 +1616,6 @@ void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *const ctx
  }
  /* Update RNTI in ue_context */
-  LOG_I(NR_RRC, "Updating UEid from %04x to %lx\n", ue_context_pP->ue_context.rnti, ctxt_pP->rntiMaybeUEid);
-  ue_context_pP->ue_id_rnti = ctxt_pP->rntiMaybeUEid; // here ue_id_rnti is just a key, may be something else
  ue_context_pP->ue_context.rnti = ctxt_pP->rntiMaybeUEid;
  if (get_softmodem_params()->sa) {
@@ -2101,19 +2078,19 @@ int nr_rrc_gNB_decode_ccch(protocol_ctxt_t    *const ctxt_pP,
          //LG COMMENT Idx = (ue_mod_idP * NB_RB_MAX) + DCCH;
          Idx = DCCH;
          // SRB1
-          ue_context_p->ue_context.Srb1.Active = 1;
+          ue_context_p->ue_context.Srb[1].Active = 1;
-          ue_context_p->ue_context.Srb1.Srb_info.Srb_id = Idx;
+          ue_context_p->ue_context.Srb[1].Srb_info.Srb_id = Idx;
-          rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb1.Srb_info.Lchan_desc[0]);
+          rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb[1].Srb_info.Lchan_desc[0]);
-          rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb1.Srb_info.Lchan_desc[1]);
+          rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb[1].Srb_info.Lchan_desc[1]);
          // SRB2: set  it to go through SRB1 with id 1 (DCCH)
-          ue_context_p->ue_context.Srb2.Active = 1;
+          ue_context_p->ue_context.Srb[2].Active = 1;
-          ue_context_p->ue_context.Srb2.Srb_info.Srb_id = Idx;
+          ue_context_p->ue_context.Srb[2].Srb_info.Srb_id = Idx;
-          rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb2.Srb_info.Lchan_desc[0]);
+          rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb[2].Srb_info.Lchan_desc[0]);
-          rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb2.Srb_info.Lchan_desc[1]);
+          rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb[2].Srb_info.Lchan_desc[1]);
-        rrc_gNB_generate_RRCReestablishment(ctxt_pP, ue_context_p, du_to_cu_rrc_container, gnb_rrc_inst->carrier.servingcellconfigcommon, 0);
+          rrc_gNB_generate_RRCReestablishment(ctxt_pP, ue_context_p, du_to_cu_rrc_container, gnb_rrc_inst->carrier.servingcellconfigcommon, 0);
-        LOG_I(NR_RRC, "CALLING RLC CONFIG SRB1 (rbid %d)\n", Idx);
+          LOG_I(NR_RRC, "CALLING RLC CONFIG SRB1 (rbid %d)\n", Idx);
      } break;
      case NR_UL_CCCH_MessageType__c1_PR_rrcSystemInfoRequest:
@@ -2839,7 +2816,8 @@ void rrc_gNB_process_dc_overall_timeout(const module_id_t gnb_mod_idP, x2ap_ENDC
  rrc_remove_nsa_user(rrc, m->rnti);
 }
-static int  rrc_process_DU_DL(MessageDef *msg_p, const char *msg_name, instance_t instance) {
+static int rrc_process_DU_DL(MessageDef *msg_p, instance_t instance)
+{
  NRDuDlReq_t * req=&NRDuDlReq(msg_p);
  protocol_ctxt_t ctxt = {.rntiMaybeUEid = req->rnti, .module_id = instance, .instance = instance, .enb_flag = 1, .eNB_index = instance};
  gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
@@ -2896,19 +2874,18 @@ static int  rrc_process_DU_DL(MessageDef *msg_p, const char *msg_name, instance_
 	    if (SRB_configList != NULL) {
 	      for (i = 0; (i < SRB_configList->list.count) && (i < 3); i++) {
 		if (SRB_configList->list.array[i]->srb_Identity == 1 ) {
-		  ue_context_p->ue_context.Srb1.Active=1;
+      ue_context_p->ue_context.Srb[1].Active = 1;
-		} else if (SRB_configList->list.array[i]->srb_Identity == 2 )  {
+    } else if (SRB_configList->list.array[i]->srb_Identity == 2) {
-		  ue_context_p->ue_context.Srb2.Active=1;
+      ue_context_p->ue_context.Srb[2].Active = 1;
-		  ue_context_p->ue_context.Srb2.Srb_info.Srb_id=2;
+      ue_context_p->ue_context.Srb[2].Srb_info.Srb_id = 2;
-		  LOG_I(F1AP, "[DU %d] SRB2 is now active\n",ctxt.module_id);
+      LOG_I(F1AP, "[DU %d] SRB2 is now active\n", ctxt.module_id);
-		} else {
+    } else {
-		  LOG_W(F1AP, "[DU %d] invalide SRB identity %ld\n",ctxt.module_id,
+      LOG_W(F1AP, "[DU %d] invalide SRB identity %ld\n", ctxt.module_id, SRB_configList->list.array[i]->srb_Identity);
-			SRB_configList->list.array[i]->srb_Identity);
+    }
-		}
+        }
-	      }
+      }
-	    }
+      if (DRB_configList != NULL) {
-	    if (DRB_configList != NULL) {
 	      for (i = 0; i < DRB_configList->list.count; i++) {  // num max DRB (11-3-8)
 		if (DRB_configList->list.array[i]) {
 		  drb_id = (int)DRB_configList->list.array[i]->drb_Identity;
@@ -3028,8 +3005,8 @@ static int  rrc_process_DU_DL(MessageDef *msg_p, const char *msg_name, instance_
 return 0;
 }
-static void rrc_DU_process_ue_context_setup_request(MessageDef *msg_p, const char *msg_name, instance_t instance){
+static void rrc_DU_process_ue_context_setup_request(MessageDef *msg_p, instance_t instance)
+{
  f1ap_ue_context_setup_t * req=&F1AP_UE_CONTEXT_SETUP_REQ(msg_p);
  protocol_ctxt_t ctxt = {.rntiMaybeUEid = req->rnti, .module_id = instance, .instance = instance, .enb_flag = 1, .eNB_index = instance};
  gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
@@ -3257,8 +3234,8 @@ static void rrc_DU_process_ue_context_setup_request(MessageDef *msg_p, const cha
  itti_send_msg_to_task (TASK_DU_F1, ctxt.module_id, message_p);
 }
-static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, const char *msg_name, instance_t instance){
+static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, instance_t instance)
+{
  f1ap_ue_context_setup_t * req=&F1AP_UE_CONTEXT_MODIFICATION_REQ(msg_p);
  protocol_ctxt_t ctxt = {.rntiMaybeUEid = req->rnti, .module_id = instance, .instance = instance, .enb_flag = 1, .eNB_index = instance};
  gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
@@ -3407,8 +3384,8 @@ static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, co
  itti_send_msg_to_task (TASK_DU_F1, ctxt.module_id, message_p);
 }
-static void rrc_CU_process_ue_context_setup_response(MessageDef *msg_p, const char *msg_name, instance_t instance){
+static void rrc_CU_process_ue_context_setup_response(MessageDef *msg_p, instance_t instance)
+{
  f1ap_ue_context_setup_t * resp=&F1AP_UE_CONTEXT_SETUP_RESP(msg_p);
  protocol_ctxt_t ctxt = {.rntiMaybeUEid = resp->rnti, .module_id = instance, .instance = instance, .enb_flag = 1, .eNB_index = instance};
  gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
@@ -3460,11 +3437,10 @@ static void rrc_CU_process_ue_context_setup_response(MessageDef *msg_p, const ch
  free(cellGroupConfig->rlc_BearerToAddModList);
  free(cellGroupConfig);
 }
-static void rrc_CU_process_ue_context_modification_response(MessageDef *msg_p, const char *msg_name, instance_t instance){
+static void rrc_CU_process_ue_context_modification_response(MessageDef *msg_p, instance_t instance)
+{
  f1ap_ue_context_setup_t *resp=&F1AP_UE_CONTEXT_SETUP_RESP(msg_p);
  protocol_ctxt_t ctxt = {.rntiMaybeUEid = resp->rnti, .module_id = instance, .instance = instance, .enb_flag = 1, .eNB_index = instance};
  gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
@@ -3845,8 +3821,7 @@ void prepare_and_send_ue_context_modification_f1(rrc_gNB_ue_context_t *ue_contex
 void rrc_gNB_process_e1_bearer_context_setup_resp(e1ap_bearer_setup_resp_t *resp, instance_t instance) {
  // Find the UE context from UE ID and send ITTI message to F1AP to send UE context modification message to DU
-  uint16_t ue_initial_id = 0; // Making an invalid UE initial ID
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context_from_ngap_ids(instance, resp->gNB_cu_cp_ue_id);
-  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context_from_ngap_ids(instance, ue_initial_id, resp->gNB_cu_cp_ue_id);
  protocol_ctxt_t ctxt = {0};
  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, GNB_FLAG_YES, ue_context_p->ue_context.rnti, 0, 0, 0);
@@ -3930,8 +3905,7 @@ static void write_rrc_stats(const gNB_RRC_INST *rrc)
 ///---------------------------------------------------------------------------------------------------------------///
 ///---------------------------------------------------------------------------------------------------------------///
 void *rrc_gnb_task(void *args_p) {
-  MessageDef                         *msg_p;
+  MessageDef *msg_p;
-  const char                         *msg_name_p;
  instance_t                         instance;
  int                                result;
  //SRB_INFO                           *srb_info_p;
@@ -3948,9 +3922,9 @@ void *rrc_gnb_task(void *args_p) {
  while (1) {
    // Wait for a message
    itti_receive_msg(TASK_RRC_GNB, &msg_p);
-    msg_name_p = ITTI_MSG_NAME(msg_p);
+    const char *msg_name_p = ITTI_MSG_NAME(msg_p);
    instance = ITTI_MSG_DESTINATION_INSTANCE(msg_p);
+    LOG_D(NR_RRC, "Received Msg %s\n", msg_name_p);
    switch (ITTI_MSG_ID(msg_p)) {
      case TERMINATE_MESSAGE:
        LOG_W(NR_RRC, " *** Exiting NR_RRC thread\n");
@@ -4000,53 +3974,50 @@ void *rrc_gnb_task(void *args_p) {
        break;
      case NGAP_DOWNLINK_NAS:
-        rrc_gNB_process_NGAP_DOWNLINK_NAS(msg_p, msg_name_p, instance, &rrc_gNB_mui);
+        rrc_gNB_process_NGAP_DOWNLINK_NAS(msg_p, instance, &rrc_gNB_mui);
        break;
      case NGAP_PDUSESSION_SETUP_REQ:
-        rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(msg_p, msg_name_p, instance);
+        rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(msg_p, instance);
        break;
      case NGAP_PDUSESSION_MODIFY_REQ:
-        rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(msg_p, msg_name_p, instance);
+        rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(msg_p, instance);
        break;
      case NGAP_PDUSESSION_RELEASE_COMMAND:
-        rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(msg_p, msg_name_p, instance);
+        rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(msg_p, instance);
        break;
      /* Messages from gNB app */
      case NRRRC_CONFIGURATION_REQ:
-        LOG_I(NR_RRC, "[gNB %ld] Received %s : %p\n", instance, msg_name_p,&NRRRC_CONFIGURATION_REQ(msg_p));
        openair_rrc_gNB_configuration(GNB_INSTANCE_TO_MODULE_ID(instance), &NRRRC_CONFIGURATION_REQ(msg_p));
        break;
      /* Messages from F1AP task */
      case F1AP_SETUP_REQ:
-        AssertFatal(NODE_IS_CU(RC.nrrrc[instance]->node_type),
+        AssertFatal(NODE_IS_CU(RC.nrrrc[instance]->node_type), "should not receive F1AP_SETUP_REQUEST, need call by CU!\n");
-                    "should not receive F1AP_SETUP_REQUEST, need call by CU!\n");
-        LOG_I(NR_RRC,"[gNB %ld] Received %s : %p\n", instance, msg_name_p, &F1AP_SETUP_REQ(msg_p));
        rrc_gNB_process_f1_setup_req(&F1AP_SETUP_REQ(msg_p));
        break;
      case NR_DU_RRC_DL_INDICATION:
-        rrc_process_DU_DL(msg_p, msg_name_p, instance);
+        rrc_process_DU_DL(msg_p, instance);
        break;
      case F1AP_UE_CONTEXT_SETUP_REQ:
-        rrc_DU_process_ue_context_setup_request(msg_p, msg_name_p, instance);
+        rrc_DU_process_ue_context_setup_request(msg_p, instance);
        break;
      case F1AP_UE_CONTEXT_SETUP_RESP:
-        rrc_CU_process_ue_context_setup_response(msg_p, msg_name_p, instance);
+        rrc_CU_process_ue_context_setup_response(msg_p, instance);
        break;
      case F1AP_UE_CONTEXT_MODIFICATION_RESP:
-        rrc_CU_process_ue_context_modification_response(msg_p, msg_name_p, instance);
+        rrc_CU_process_ue_context_modification_response(msg_p, instance);
        break;
      case F1AP_UE_CONTEXT_MODIFICATION_REQ:
-        rrc_DU_process_ue_context_modification_request(msg_p, msg_name_p, instance);
+        rrc_DU_process_ue_context_modification_request(msg_p, instance);
        break;
      case F1AP_UE_CONTEXT_RELEASE_CMD:
@@ -4065,7 +4036,7 @@ void *rrc_gnb_task(void *args_p) {
        break;
      case NGAP_INITIAL_CONTEXT_SETUP_REQ:
-        rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p, msg_name_p, instance);
+        rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p, instance);
        break;
      case X2AP_ENDC_SGNB_RELEASE_REQUEST:
@@ -4078,24 +4049,22 @@ void *rrc_gnb_task(void *args_p) {
        break;
      case NGAP_UE_CONTEXT_RELEASE_REQ:
-        rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_REQ(msg_p, msg_name_p, instance);
+        rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_REQ(msg_p, instance);
        break;
      case NGAP_UE_CONTEXT_RELEASE_COMMAND:
-        rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND(msg_p, msg_name_p, instance);
+        rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND(msg_p, instance);
        break;
      case E1AP_SETUP_REQ:
-        LOG_I(NR_RRC, "Received E1AP_SETUP_REQ for instance %d\n", (int)instance);
        rrc_gNB_process_e1_setup_req(&E1AP_SETUP_REQ(msg_p), instance);
        break;
      case E1AP_BEARER_CONTEXT_SETUP_RESP:
-        LOG_I(NR_RRC, "Received E1AP_BEARER_CONTEXT_SETUP_RESP for instance %d\n", (int)instance);
        rrc_gNB_process_e1_bearer_context_setup_resp(&E1AP_BEARER_CONTEXT_SETUP_RESP(msg_p), instance);
      case NGAP_PAGING_IND:
-        rrc_gNB_process_PAGING_IND(msg_p, msg_name_p, instance);
+        rrc_gNB_process_PAGING_IND(msg_p, instance);
        break;
      default:
@@ -4138,8 +4107,8 @@ rrc_gNB_generate_SecurityModeCommand(
    case ngran_gNB_CU:
    case ngran_gNB_CUCP:
      // create an ITTI message
-      memcpy(ue_context_pP->ue_context.Srb1.Srb_info.Tx_buffer.Payload, buffer, size);
+      memcpy(ue_context_pP->ue_context.Srb[1].Srb_info.Tx_buffer.Payload, buffer, size);
-      ue_context_pP->ue_context.Srb1.Srb_info.Tx_buffer.payload_size = size;
+      ue_context_pP->ue_context.Srb[1].Srb_info.Tx_buffer.payload_size = size;
      LOG_I(NR_RRC,"calling rrc_data_req :securityModeCommand\n");
      nr_rrc_data_req(ctxt_pP,

--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
--- a/openair2/RRC/NR/rrc_gNB_NGAP.h
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.h
@@ -40,18 +40,6 @@
 #include "NR_UL-DCCH-Message.h"
 #include "NGAP_CauseRadioNetwork.h"
-typedef struct rrc_ue_ngap_ids_s {
-  /* Tree related data */
-  RB_ENTRY(rrc_ue_ngap_ids_s) entries;
-  // keys
-  uint16_t ue_initial_id;
-  uint32_t gNB_ue_ngap_id;
-  // value
-  rnti_t   ue_rnti;
-} rrc_ue_ngap_ids_t;
 void
 rrc_gNB_send_NGAP_NAS_FIRST_REQ(
    const protocol_ctxt_t     *const ctxt_pP,
@@ -59,12 +47,7 @@ rrc_gNB_send_NGAP_NAS_FIRST_REQ(
    NR_RRCSetupComplete_IEs_t *rrcSetupComplete
 );
-int
+int rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(MessageDef *msg_p, instance_t instance);
-rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(
-    MessageDef *msg_p,
-    const char *msg_name,
-    instance_t instance
-);
 void
 rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(
@@ -72,20 +55,7 @@ rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(
    rrc_gNB_ue_context_t          *const ue_context_pP
 );
-int
+int rrc_gNB_process_NGAP_DOWNLINK_NAS(MessageDef *msg_p, instance_t instance, mui_t *rrc_gNB_mui);
-rrc_gNB_process_security(
-  const protocol_ctxt_t *const ctxt_pP,
-  rrc_gNB_ue_context_t *const ue_context_pP,
-  ngap_security_capabilities_t *security_capabilities_pP
-);
-int
-rrc_gNB_process_NGAP_DOWNLINK_NAS(
-  MessageDef *msg_p,
-  const char *msg_name,
-  instance_t  instance,
-  mui_t      *rrc_gNB_mui
-);
 void
 rrc_gNB_send_NGAP_UPLINK_NAS(
@@ -101,19 +71,9 @@ rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(
  uint8_t                   xid
 );
-void
+void rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(MessageDef *msg_p, instance_t instance);
-rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
-    MessageDef *msg_p,
-    const char *msg_name,
-    instance_t instance
-);
-int
+int rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(MessageDef *msg_p, instance_t instance);
-rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
-  MessageDef *msg_p,
-  const char *msg_name,
-  instance_t instance
-);
 int
 rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
@@ -128,38 +88,13 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
  rrc_gNB_ue_context_t      *ue_context_pP
 );
+void rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_REQ(const module_id_t gnb_mod_idP, const rrc_gNB_ue_context_t *const ue_context_pP, const NGAP_Cause_PR causeP, const long cause_valueP);
-void
+int rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_REQ(MessageDef *msg_p, instance_t instance);
-rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_REQ(
-  const module_id_t gnb_mod_idP,
-  const rrc_gNB_ue_context_t *const ue_context_pP,
-  const ngap_Cause_t causeP,
-  const long cause_valueP
-);
-int 
-rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_REQ (
-  MessageDef *msg_p, 
-  const char *msg_name, 
-  instance_t instance
-);
-int
-rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND(
-  MessageDef *msg_p,
-  const char *msg_name,
-  instance_t instance
-);
-void rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_COMPLETE(
+int rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND(MessageDef *msg_p, instance_t instance);
-  instance_t instance,
-  uint32_t   gNB_ue_ngap_id);
-void
+void rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_COMPLETE(instance_t instance, uint32_t gNB_ue_ngap_id);
-rrc_gNB_NGAP_remove_ue_ids(
-  gNB_RRC_INST *const rrc_instance_pP,
-  struct rrc_ue_ngap_ids_s *const ue_ids_pP
-);
 void
 rrc_gNB_send_NGAP_UE_CAPABILITIES_IND(
@@ -168,12 +103,7 @@ rrc_gNB_send_NGAP_UE_CAPABILITIES_IND(
  NR_UL_DCCH_Message_t     *const ul_dcch_msg
 );
-int
+int rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(MessageDef *msg_p, instance_t instance);
-rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(
-  MessageDef *msg_p,
-  const char *msg_name,
-  instance_t instance
-);
 void
 rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE(
@@ -189,17 +119,6 @@ nr_rrc_pdcp_config_security(
    const uint8_t          send_security_mode_command
 );
-struct rrc_gNB_ue_context_s *
+int rrc_gNB_process_PAGING_IND(MessageDef *msg_p, instance_t instance);
-rrc_gNB_get_ue_context_from_ngap_ids(
-    const instance_t  instanceP,
-    const uint16_t    ue_initial_idP,
-    const uint32_t    gNB_ue_ngap_idP
-);
-int
-rrc_gNB_process_PAGING_IND(
-    MessageDef *msg_p,
-    const char *msg_name,
-    instance_t instance);
 #endif
--- a/openair2/RRC/NR/rrc_gNB_radio_bearers.c
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
@@ -22,19 +22,16 @@
 #include "rrc_gNB_radio_bearers.h"
 #include "oai_asn1.h"
-NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering)
+NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, rrc_pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering)
 {
-  NR_DRB_ToAddMod_t *DRB_config  = NULL;
+  NR_DRB_ToAddMod_t *DRB_config = CALLOC(1, sizeof(*DRB_config));
-  NR_SDAP_Config_t  *SDAP_config = NULL;
-  DRB_config = CALLOC(1, sizeof(*DRB_config));
  DRB_config->drb_Identity = drb_id;
-  DRB_config->cnAssociation = CALLOC(1, sizeof(*DRB_config->cnAssociation));
+  asn1cCalloc(DRB_config->cnAssociation, association);
-  DRB_config->cnAssociation->present = NR_DRB_ToAddMod__cnAssociation_PR_sdap_Config;
+  association->present = NR_DRB_ToAddMod__cnAssociation_PR_sdap_Config;
  /* SDAP Configuration */
-  SDAP_config = CALLOC(1, sizeof(NR_SDAP_Config_t));
+  NR_SDAP_Config_t *SDAP_config = CALLOC(1, sizeof(NR_SDAP_Config_t));
-  SDAP_config->mappedQoS_FlowsToAdd = calloc(1, sizeof(struct NR_SDAP_Config__mappedQoS_FlowsToAdd));
+  asn1cCalloc(SDAP_config->mappedQoS_FlowsToAdd, sdapFlows);
  SDAP_config->pdu_Session = pduSession->param.pdusession_id;
@@ -50,7 +47,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par
  for (int qos_flow_index = 0; qos_flow_index < pduSession->param.nb_qos; qos_flow_index++) 
  {
-    NR_QFI_t *qfi = calloc(1, sizeof(NR_QFI_t));
+    asn1cSequenceAdd(sdapFlows->list, NR_QFI_t, qfi);
    *qfi = pduSession->param.qos[qos_flow_index].qfi;
    asn1cSeqAdd(&SDAP_config->mappedQoS_FlowsToAdd->list, qfi);
@@ -59,44 +56,29 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par
    else
      pduSession->param.used_drbs[drb_id - 1] = DRB_ACTIVE;
  }
-  SDAP_config->mappedQoS_FlowsToRelease = NULL;
+  association->choice.sdap_Config = SDAP_config;
-  DRB_config->cnAssociation->choice.sdap_Config = SDAP_config;
  /* PDCP Configuration */
-  DRB_config->reestablishPDCP  = NULL;
+  asn1cCalloc(DRB_config->pdcp_Config, pdcpConfig);
-  DRB_config->recoverPDCP      = NULL;
+  asn1cCalloc(pdcpConfig->drb, drb);
-  DRB_config->pdcp_Config      = calloc(1, sizeof(*DRB_config->pdcp_Config));
-  DRB_config->pdcp_Config->drb = calloc(1,sizeof(*DRB_config->pdcp_Config->drb));
+  asn1cCallocOne(drb->discardTimer, NR_PDCP_Config__drb__discardTimer_infinity);
-  DRB_config->pdcp_Config->drb->discardTimer    = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->discardTimer));
+  asn1cCallocOne(drb->pdcp_SN_SizeUL, NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits);
-  *DRB_config->pdcp_Config->drb->discardTimer   = NR_PDCP_Config__drb__discardTimer_infinity;
+  asn1cCallocOne(drb->pdcp_SN_SizeDL, NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits);
-  DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL  = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL));
-  *DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL = NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits;
+  drb->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
-  DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL  = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL));
+  drb->headerCompression.choice.notUsed = 0;
-  *DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL = NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits;
+  asn1cCallocOne(pdcpConfig->t_Reordering, NR_PDCP_Config__t_Reordering_ms0);
-  DRB_config->pdcp_Config->drb->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
-  DRB_config->pdcp_Config->drb->headerCompression.choice.notUsed = 0;
-  DRB_config->pdcp_Config->drb->integrityProtection  = NULL;
-  DRB_config->pdcp_Config->drb->statusReportRequired = NULL;
-  DRB_config->pdcp_Config->drb->outOfOrderDelivery   = NULL;
-  DRB_config->pdcp_Config->moreThanOneRLC            = NULL;
-  DRB_config->pdcp_Config->t_Reordering  = calloc(1, sizeof(*DRB_config->pdcp_Config->t_Reordering));
-  *DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms0;
-  DRB_config->pdcp_Config->ext1          = NULL;
  if (do_drb_integrity) {
-    DRB_config->pdcp_Config->drb->integrityProtection = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->integrityProtection));
+    asn1cCallocOne(drb->integrityProtection, NR_PDCP_Config__drb__integrityProtection_enabled);
-    *DRB_config->pdcp_Config->drb->integrityProtection = NR_PDCP_Config__drb__integrityProtection_enabled;
  }
  if (!do_drb_ciphering) {
-    DRB_config->pdcp_Config->ext1 = calloc(1, sizeof(*DRB_config->pdcp_Config->ext1));
+    asn1cCalloc(pdcpConfig->ext1, ext1);
-    DRB_config->pdcp_Config->ext1->cipheringDisabled = calloc(1, sizeof(*DRB_config->pdcp_Config->ext1->cipheringDisabled));
+    asn1cCallocOne(ext1->cipheringDisabled, NR_PDCP_Config__ext1__cipheringDisabled_true);
-    *DRB_config->pdcp_Config->ext1->cipheringDisabled = NR_PDCP_Config__ext1__cipheringDisabled_true;
  }
  ue->DRB_active[drb_id-1] = DRB_ACTIVE;
@@ -104,7 +86,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par
  return DRB_config;
 }
-uint8_t next_available_drb(gNB_RRC_UE_t *ue, pdu_session_param_t *pdusession, bool is_gbr)
+uint8_t next_available_drb(gNB_RRC_UE_t *ue, rrc_pdu_session_param_t *pdusession, bool is_gbr)
 {
  uint8_t drb_id;

--- a/openair2/RRC/NR/rrc_gNB_radio_bearers.h
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.h
@@ -35,10 +35,8 @@
 #define GBR_FLOW                (1)
 #define NONGBR_FLOW             (0)
-NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue, uint8_t drb_id, pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering);
+NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue, uint8_t drb_id, rrc_pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering);
+uint8_t next_available_drb(gNB_RRC_UE_t *ue, rrc_pdu_session_param_t *pdusession, bool is_gbr);
-uint8_t next_available_drb(gNB_RRC_UE_t *ue, pdu_session_param_t *pdusession, bool is_gbr);
 bool drb_is_active(gNB_RRC_UE_t *ue, uint8_t drb_id);
 #endif
--- a/openair3/NGAP/ngap_common.h
+++ b/openair3/NGAP/ngap_common.h
@@ -113,27 +113,27 @@ extern int asn1_xer_print;
 # define NGAP_DEBUG(x, args...) do { fprintf(stdout, "[NGAP][D]"x, ##args); } while(0)
 #endif
+#define NGAP_FIND_PROTOCOLIE_BY_ID(IE_TYPE, ie, container, IE_ID, mandatory)                                                            \
+  do {                                                                                                                                  \
+    IE_TYPE **ptr;                                                                                                                      \
+    ie = NULL;                                                                                                                          \
+    for (ptr = container->protocolIEs.list.array; ptr < &container->protocolIEs.list.array[container->protocolIEs.list.count]; ptr++) { \
+      if ((*ptr)->id == IE_ID) {                                                                                                        \
+        ie = *ptr;                                                                                                                      \
+        break;                                                                                                                          \
+      }                                                                                                                                 \
+    }                                                                                                                                   \
+    if (ie == NULL) {                                                                                                                   \
+      if (mandatory) {                                                                                                                  \
+        AssertFatal(NGAP, "NGAP_FIND_PROTOCOLIE_BY_ID ie is NULL (searching for ie: %ld)\n", IE_ID);                                    \
+      } else {                                                                                                                          \
+        NGAP_INFO("NGAP_FIND_PROTOCOLIE_BY_ID ie is NULL (searching for ie: %ld)\n", IE_ID);                                            \
+      }                                                                                                                                 \
+    }                                                                                                                                   \
+  } while (0);                                                                                                                          \
+  if (mandatory && !ie)                                                                                                                 \
+  return -1
-#define NGAP_FIND_PROTOCOLIE_BY_ID(IE_TYPE, ie, container, IE_ID, mandatory) \
-  do {\
-    IE_TYPE **ptr; \
-    ie = NULL; \
-    for (ptr = container->protocolIEs.list.array; \
-         ptr < &container->protocolIEs.list.array[container->protocolIEs.list.count]; \
-         ptr++) { \
-      if((*ptr)->id == IE_ID) { \
-        ie = *ptr; \
-        break; \
-      } \
-    } \
-    if (ie == NULL ) { \
-      if (mandatory) {\
-      NGAP_ERROR("NGAP_FIND_PROTOCOLIE_BY_ID: %s %d: ie is NULL (searching for ie: %ld)\n",__FILE__,__LINE__, IE_ID);\
-      abort();\
-      }\
-      else NGAP_INFO("NGAP_FIND_PROTOCOLIE_BY_ID: %s %d: ie is NULL (searching for ie: %ld)\n",__FILE__,__LINE__, IE_ID);\
-    } \
-  } while(0)
 /** \brief Function callback prototype.
 **/
 typedef int (*ngap_message_decoded_callback)(

--- a/openair3/NGAP/ngap_gNB.c
+++ b/openair3/NGAP/ngap_gNB.c
@@ -162,7 +162,6 @@ void ngap_gNB_handle_register_gNB(instance_t instance, ngap_register_gnb_req_t *
  } else {
    new_instance = calloc(1, sizeof(ngap_gNB_instance_t));
    DevAssert(new_instance != NULL);
-    RB_INIT(&new_instance->ngap_ue_head);
    RB_INIT(&new_instance->ngap_amf_head);
    /* Copy usefull parameters */
    new_instance->instance         = instance;
@@ -276,127 +275,88 @@ void *ngap_gNB_process_itti_msg(void *notUsed) {
  MessageDef *received_msg = NULL;
  int         result;
  itti_receive_msg(TASK_NGAP, &received_msg);
+  if (received_msg) {
+    instance_t instance = ITTI_MSG_DESTINATION_INSTANCE(received_msg);
+    LOG_D(RRC, "Received message %s\n", ITTI_MSG_NAME(received_msg));
+    switch (ITTI_MSG_ID(received_msg)) {
+      case TERMINATE_MESSAGE:
+        NGAP_WARN(" *** Exiting NGAP thread\n");
+        itti_exit_task();
+        break;
-  switch (ITTI_MSG_ID(received_msg)) {
+      case NGAP_REGISTER_GNB_REQ: {
-    case TERMINATE_MESSAGE:
+        /* Register a new gNB.
-      NGAP_WARN(" *** Exiting NGAP thread\n");
+         * in Virtual mode gNBs will be distinguished using the mod_id/
-      itti_exit_task();
+         * Each gNB has to send an NGAP_REGISTER_GNB message with its
-      break;
+         * own parameters.
+         */
-    case NGAP_REGISTER_GNB_REQ: {
+        ngap_gNB_handle_register_gNB(instance, &NGAP_REGISTER_GNB_REQ(received_msg));
-      /* Register a new gNB.
+      } break;
-       * in Virtual mode gNBs will be distinguished using the mod_id/
-       * Each gNB has to send an NGAP_REGISTER_GNB message with its
+      case SCTP_NEW_ASSOCIATION_RESP: {
-       * own parameters.
+        ngap_gNB_handle_sctp_association_resp(instance, &received_msg->ittiMsg.sctp_new_association_resp);
-       */
+      } break;
-      ngap_gNB_handle_register_gNB(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
-                                   &NGAP_REGISTER_GNB_REQ(received_msg));
+      case SCTP_DATA_IND: {
-    }
+        ngap_gNB_handle_sctp_data_ind(&received_msg->ittiMsg.sctp_data_ind);
-    break;
+      } break;
-    case SCTP_NEW_ASSOCIATION_RESP: {
+      case NGAP_NAS_FIRST_REQ: {
-      ngap_gNB_handle_sctp_association_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
+        ngap_gNB_handle_nas_first_req(instance, &NGAP_NAS_FIRST_REQ(received_msg));
-                                            &received_msg->ittiMsg.sctp_new_association_resp);
+      } break;
-    }
-    break;
+      case NGAP_UPLINK_NAS: {
+        ngap_gNB_nas_uplink(instance, &NGAP_UPLINK_NAS(received_msg));
-    case SCTP_DATA_IND: {
+      } break;
-      ngap_gNB_handle_sctp_data_ind(&received_msg->ittiMsg.sctp_data_ind);
-    }
+      case NGAP_UE_CAPABILITIES_IND: {
-    break;
+        ngap_gNB_ue_capabilities(instance, &NGAP_UE_CAPABILITIES_IND(received_msg));
+      } break;
-    case NGAP_NAS_FIRST_REQ: {
-      ngap_gNB_handle_nas_first_req(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
+      case NGAP_INITIAL_CONTEXT_SETUP_RESP: {
-                                    &NGAP_NAS_FIRST_REQ(received_msg));
+        ngap_gNB_initial_ctxt_resp(instance, &NGAP_INITIAL_CONTEXT_SETUP_RESP(received_msg));
-    }
+      } break;
-    break;
+      case NGAP_PDUSESSION_SETUP_RESP: {
-    case NGAP_UPLINK_NAS: {
+        ngap_gNB_pdusession_setup_resp(instance, &NGAP_PDUSESSION_SETUP_RESP(received_msg));
-      ngap_gNB_nas_uplink(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
+      } break;
-                          &NGAP_UPLINK_NAS(received_msg));
-    }
+      case NGAP_PDUSESSION_MODIFY_RESP: {
-    break;
+        ngap_gNB_pdusession_modify_resp(instance, &NGAP_PDUSESSION_MODIFY_RESP(received_msg));
+      } break;
-    case NGAP_UE_CAPABILITIES_IND: {
-      ngap_gNB_ue_capabilities(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
+      case NGAP_NAS_NON_DELIVERY_IND: {
-                               &NGAP_UE_CAPABILITIES_IND(received_msg));
+        ngap_gNB_nas_non_delivery_ind(instance, &NGAP_NAS_NON_DELIVERY_IND(received_msg));
-    }
+      } break;
-    break;
+      case NGAP_PATH_SWITCH_REQ: {
-    case NGAP_INITIAL_CONTEXT_SETUP_RESP: {
+        ngap_gNB_path_switch_req(instance, &NGAP_PATH_SWITCH_REQ(received_msg));
-      ngap_gNB_initial_ctxt_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
+      } break;
-                                 &NGAP_INITIAL_CONTEXT_SETUP_RESP(received_msg));
-    }
+      case NGAP_PDUSESSION_MODIFICATION_IND: {
-    break;
+        ngap_gNB_generate_PDUSESSION_Modification_Indication(instance, &NGAP_PDUSESSION_MODIFICATION_IND(received_msg));
+      } break;
-    case NGAP_PDUSESSION_SETUP_RESP: {
-      ngap_gNB_pdusession_setup_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
+      case NGAP_UE_CONTEXT_RELEASE_COMPLETE: {
-                                &NGAP_PDUSESSION_SETUP_RESP(received_msg));
+        ngap_ue_context_release_complete(instance, &NGAP_UE_CONTEXT_RELEASE_COMPLETE(received_msg));
-    }
+      } break;
-    break;
+      case NGAP_UE_CONTEXT_RELEASE_REQ: {
-    case NGAP_PDUSESSION_MODIFY_RESP: {
+        ngap_ue_context_release_req(instance, &NGAP_UE_CONTEXT_RELEASE_REQ(received_msg));
-      ngap_gNB_pdusession_modify_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
+      } break;
-                                 &NGAP_PDUSESSION_MODIFY_RESP(received_msg));
-    }
+      case NGAP_PDUSESSION_RELEASE_RESPONSE: {
-    break;
+        ngap_gNB_pdusession_release_resp(instance, &NGAP_PDUSESSION_RELEASE_RESPONSE(received_msg));
+      } break;
-    case NGAP_NAS_NON_DELIVERY_IND: {
-      ngap_gNB_nas_non_delivery_ind(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
+      default:
-                                    &NGAP_NAS_NON_DELIVERY_IND(received_msg));
+        NGAP_ERROR("Received unhandled message: %d:%s\n", ITTI_MSG_ID(received_msg), ITTI_MSG_NAME(received_msg));
-    }
+        break;
-    break;
-    case NGAP_PATH_SWITCH_REQ: {
-      ngap_gNB_path_switch_req(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
-                               &NGAP_PATH_SWITCH_REQ(received_msg));
-    }
-    break;
-    case NGAP_PDUSESSION_MODIFICATION_IND: {
-    	ngap_gNB_generate_PDUSESSION_Modification_Indication(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
-    	                               &NGAP_PDUSESSION_MODIFICATION_IND(received_msg));
-    }
-    break;
-    case NGAP_UE_CONTEXT_RELEASE_COMPLETE: {
-      ngap_ue_context_release_complete(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
-                                       &NGAP_UE_CONTEXT_RELEASE_COMPLETE(received_msg));
-    }
-    break;
-    case NGAP_UE_CONTEXT_RELEASE_REQ: {
-      ngap_gNB_instance_t               *ngap_gNB_instance_p           = NULL; // test
-      struct ngap_gNB_ue_context_s      *ue_context_p                  = NULL; // test
-      ngap_ue_context_release_req(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
-                                  &NGAP_UE_CONTEXT_RELEASE_REQ(received_msg));
-      ngap_gNB_instance_p = ngap_gNB_get_instance(ITTI_MSG_DESTINATION_INSTANCE(received_msg)); // test
-      DevAssert(ngap_gNB_instance_p != NULL); // test
-      if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p,
-                          NGAP_UE_CONTEXT_RELEASE_REQ(received_msg).gNB_ue_ngap_id)) == NULL) { // test
-        /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
-        NGAP_ERROR("Failed to find ue context associated with gNB ue ngap id: %u\n",
-                   NGAP_UE_CONTEXT_RELEASE_REQ(received_msg).gNB_ue_ngap_id); // test
-      }  // test
-    }
-    break;
-    case NGAP_PDUSESSION_RELEASE_RESPONSE: {
-      ngap_gNB_pdusession_release_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
-                                  &NGAP_PDUSESSION_RELEASE_RESPONSE(received_msg));
    }
-    break;
-    default:
+    result = itti_free(ITTI_MSG_ORIGIN_ID(received_msg), received_msg);
-      NGAP_ERROR("Received unhandled message: %d:%s\n",
+    AssertFatal(result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
-                 ITTI_MSG_ID(received_msg), ITTI_MSG_NAME(received_msg));
-      break;
  }
-  result = itti_free (ITTI_MSG_ORIGIN_ID(received_msg), received_msg);
-  AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
-  received_msg = NULL;
  return NULL;
 }

--- a/openair3/NGAP/ngap_gNB_context_management_procedures.c
+++ b/openair3/NGAP/ngap_gNB_context_management_procedures.c
@@ -58,9 +58,7 @@ int ngap_ue_context_release_complete(instance_t instance,
  ngap_gNB_instance_t                 *ngap_gNB_instance_p = NULL;
  struct ngap_gNB_ue_context_s        *ue_context_p        = NULL;
-  NGAP_NGAP_PDU_t                      pdu;
+  NGAP_NGAP_PDU_t pdu = {0};
-  NGAP_UEContextReleaseComplete_t     *out;
-  NGAP_UEContextReleaseComplete_IEs_t *ie;
  uint8_t  *buffer;
  uint32_t length;
@@ -70,13 +68,7 @@ int ngap_ue_context_release_complete(instance_t instance,
  DevAssert(ue_release_complete_p != NULL);
  DevAssert(ngap_gNB_instance_p != NULL);
-  /*RB_FOREACH(ue_context_p, ngap_ue_map, &ngap_gNB_instance_p->ngap_ue_head) {
+  if ((ue_context_p = ngap_get_ue_context(ue_release_complete_p->gNB_ue_ngap_id)) == NULL) {
-    NGAP_WARN("in ngap_ue_map: UE context gNB_ue_ngap_id %u amf_ue_ngap_id %u state %u\n",
-        ue_context_p->gNB_ue_ngap_id, ue_context_p->amf_ue_ngap_id,
-        ue_context_p->ue_state);
-  }*/
-  if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p,
-                      ue_release_complete_p->gNB_ue_ngap_id)) == NULL) {
    /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: %u\n",
              ue_release_complete_p->gNB_ue_ngap_id);
@@ -84,30 +76,30 @@ int ngap_ue_context_release_complete(instance_t instance,
  }
  /* Prepare the NGAP message to encode */
-  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_successfulOutcome;
-  pdu.choice.successfulOutcome = CALLOC(1, sizeof(struct NGAP_SuccessfulOutcome));
+  asn1cCalloc(pdu.choice.successfulOutcome, head);
-  pdu.choice.successfulOutcome->procedureCode = NGAP_ProcedureCode_id_UEContextRelease;
+  head->procedureCode = NGAP_ProcedureCode_id_UEContextRelease;
-  pdu.choice.successfulOutcome->criticality = NGAP_Criticality_reject;
+  head->criticality = NGAP_Criticality_reject;
-  pdu.choice.successfulOutcome->value.present = NGAP_SuccessfulOutcome__value_PR_UEContextReleaseComplete;
+  head->value.present = NGAP_SuccessfulOutcome__value_PR_UEContextReleaseComplete;
-  out = &pdu.choice.successfulOutcome->value.choice.UEContextReleaseComplete;
+  NGAP_UEContextReleaseComplete_t *out = &head->value.choice.UEContextReleaseComplete;
  /* mandatory */
-  ie = (NGAP_UEContextReleaseComplete_IEs_t *)calloc(1, sizeof(NGAP_UEContextReleaseComplete_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UEContextReleaseComplete_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
-  ie->value.present = NGAP_UEContextReleaseComplete_IEs__value_PR_AMF_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_ignore;
-  asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    ie->value.present = NGAP_UEContextReleaseComplete_IEs__value_PR_AMF_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+  }
  /* mandatory */
-  ie = (NGAP_UEContextReleaseComplete_IEs_t *)calloc(1, sizeof(NGAP_UEContextReleaseComplete_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UEContextReleaseComplete_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_UEContextReleaseComplete_IEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.choice.RAN_UE_NGAP_ID = ue_release_complete_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_UEContextReleaseComplete_IEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = ue_release_complete_p->gNB_ue_ngap_id;
+  }
  if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
    /* Encode procedure has failed... */
@@ -123,35 +115,18 @@ int ngap_ue_context_release_complete(instance_t instance,
  //LG ngap_gNB_itti_send_sctp_close_association(ngap_gNB_instance_p->instance,
  //                                             ue_context_p->amf_ref->assoc_id);
  // release UE context
-  struct ngap_gNB_ue_context_s *ue_context2_p = NULL;
+  ngap_gNB_ue_context_t *tmp = ngap_detach_ue_context(ue_release_complete_p->gNB_ue_ngap_id);
+  if (tmp)
-  if ((ue_context2_p = RB_REMOVE(ngap_ue_map, &ngap_gNB_instance_p->ngap_ue_head, ue_context_p))
+    free(tmp);
-      != NULL) {
-    NGAP_WARN("Removed UE context gNB_ue_ngap_id %u\n",
-              ue_context2_p->gNB_ue_ngap_id);
-    ngap_gNB_free_ue_context(ue_context2_p);
-  } else {
-    NGAP_WARN("Removing UE context gNB_ue_ngap_id %u: did not find context\n",
-              ue_context_p->gNB_ue_ngap_id);
-  }
-  /*RB_FOREACH(ue_context_p, ngap_ue_map, &ngap_gNB_instance_p->ngap_ue_head) {
-    NGAP_WARN("in ngap_ue_map: UE context gNB_ue_ngap_id %u amf_ue_ngap_id %u state %u\n",
-        ue_context_p->gNB_ue_ngap_id, ue_context_p->amf_ue_ngap_id,
-        ue_context_p->ue_state);
-  }*/
  return 0;
 }
 int ngap_ue_context_release_req(instance_t instance,
                                ngap_ue_release_req_t *ue_release_req_p)
 {
  ngap_gNB_instance_t                *ngap_gNB_instance_p           = NULL;
  struct ngap_gNB_ue_context_s       *ue_context_p                  = NULL;
-  NGAP_NGAP_PDU_t                     pdu;
+  NGAP_NGAP_PDU_t pdu = {0};
-  NGAP_UEContextReleaseRequest_t     *out;
-  NGAP_UEContextReleaseRequest_IEs_t *ie;
  uint8_t                            *buffer                        = NULL;
  uint32_t                            length;
  /* Retrieve the NGAP gNB instance associated with Mod_id */
@@ -160,8 +135,7 @@ int ngap_ue_context_release_req(instance_t instance,
  DevAssert(ue_release_req_p != NULL);
  DevAssert(ngap_gNB_instance_p != NULL);
-  if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p,
+  if ((ue_context_p = ngap_get_ue_context(ue_release_req_p->gNB_ue_ngap_id)) == NULL) {
-                      ue_release_req_p->gNB_ue_ngap_id)) == NULL) {
    /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: %u\n",
              ue_release_req_p->gNB_ue_ngap_id);
@@ -169,33 +143,34 @@ int ngap_ue_context_release_req(instance_t instance,
  }
  /* Prepare the NGAP message to encode */
-  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage;
-  pdu.choice.initiatingMessage = CALLOC(1, sizeof(struct NGAP_InitiatingMessage));
+  asn1cCalloc(pdu.choice.initiatingMessage, head);
-  pdu.choice.initiatingMessage->procedureCode = NGAP_ProcedureCode_id_UEContextReleaseRequest;
+  head->procedureCode = NGAP_ProcedureCode_id_UEContextReleaseRequest;
-  pdu.choice.initiatingMessage->criticality = NGAP_Criticality_ignore;
+  head->criticality = NGAP_Criticality_ignore;
-  pdu.choice.initiatingMessage->value.present = NGAP_InitiatingMessage__value_PR_UEContextReleaseRequest;
+  head->value.present = NGAP_InitiatingMessage__value_PR_UEContextReleaseRequest;
-  out = &pdu.choice.initiatingMessage->value.choice.UEContextReleaseRequest;
+  NGAP_UEContextReleaseRequest_t *out = &head->value.choice.UEContextReleaseRequest;
  /* mandatory */
-  ie = (NGAP_UEContextReleaseRequest_IEs_t *)calloc(1, sizeof(NGAP_UEContextReleaseRequest_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UEContextReleaseRequest_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
-  ie->value.present = NGAP_UEContextReleaseRequest_IEs__value_PR_AMF_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
-  asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    ie->value.present = NGAP_UEContextReleaseRequest_IEs__value_PR_AMF_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+  }
  /* mandatory */
-  ie = (NGAP_UEContextReleaseRequest_IEs_t *)calloc(1, sizeof(NGAP_UEContextReleaseRequest_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UEContextReleaseRequest_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_UEContextReleaseRequest_IEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
-  ie->value.choice.RAN_UE_NGAP_ID = ue_release_req_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_UEContextReleaseRequest_IEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = ue_release_req_p->gNB_ue_ngap_id;
+  }
  /* optional */
  if (ue_release_req_p->nb_of_pdusessions > 0) {
-    ie = (NGAP_UEContextReleaseRequest_IEs_t *)calloc(1, sizeof(NGAP_UEContextReleaseRequest_IEs_t));
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UEContextReleaseRequest_IEs_t, ie);
    ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceListCxtRelReq;
    ie->criticality = NGAP_Criticality_reject;
    ie->value.present = NGAP_UEContextReleaseRequest_IEs__value_PR_PDUSessionResourceListCxtRelReq;
@@ -205,51 +180,19 @@ int ngap_ue_context_release_req(instance_t instance,
      item->pDUSessionID = ue_release_req_p->pdusessions[i].pdusession_id;
      asn1cSeqAdd(&ie->value.choice.PDUSessionResourceListCxtRelReq.list, item);
    }
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
  /* mandatory */
-  ie = (NGAP_UEContextReleaseRequest_IEs_t *)calloc(1, sizeof(NGAP_UEContextReleaseRequest_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_Cause;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UEContextReleaseRequest_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_Cause;
-  ie->value.present = NGAP_UEContextReleaseRequest_IEs__value_PR_Cause;
+    ie->criticality = NGAP_Criticality_ignore;
+    ie->value.present = NGAP_UEContextReleaseRequest_IEs__value_PR_Cause;
-  switch (ue_release_req_p->cause) {
+    DevAssert(ue_release_req_p->cause <= NGAP_Cause_PR_choice_Extensions);
-    case NGAP_Cause_PR_radioNetwork:
+    ie->value.choice.Cause.present = ue_release_req_p->cause;
-      ie->value.choice.Cause.present = NGAP_Cause_PR_radioNetwork;
+    ie->value.choice.Cause.choice.misc = ue_release_req_p->cause_value;
-      ie->value.choice.Cause.choice.radioNetwork = ue_release_req_p->cause_value;
-      break;
-    case NGAP_Cause_PR_transport:
-      ie->value.choice.Cause.present = NGAP_Cause_PR_transport;
-      ie->value.choice.Cause.choice.transport = ue_release_req_p->cause_value;
-      break;
-    case NGAP_Cause_PR_nas:
-      ie->value.choice.Cause.present = NGAP_Cause_PR_nas;
-      ie->value.choice.Cause.choice.nas = ue_release_req_p->cause_value;
-      break;
-    case NGAP_Cause_PR_protocol:
-      ie->value.choice.Cause.present = NGAP_Cause_PR_protocol;
-      ie->value.choice.Cause.choice.protocol = ue_release_req_p->cause_value;
-      break;
-    case NGAP_Cause_PR_misc:
-      ie->value.choice.Cause.present = NGAP_Cause_PR_misc;
-      ie->value.choice.Cause.choice.misc = ue_release_req_p->cause_value;
-      break;
-    case NGAP_Cause_PR_NOTHING:
-    default:
-      ie->value.choice.Cause.present = NGAP_Cause_PR_NOTHING;
-      break;
  }
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
  if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
    /* Encode procedure has failed... */
    NGAP_ERROR("Failed to encode UE context release complete\n");

--- a/openair3/NGAP/ngap_gNB_decoder.c
+++ b/openair3/NGAP/ngap_gNB_decoder.c
@@ -156,13 +156,8 @@ int ngap_gNB_decode_pdu(NGAP_NGAP_PDU_t *pdu, const uint8_t *const buffer,
  asn_dec_rval_t dec_ret;
  DevAssert(pdu != NULL);
  DevAssert(buffer != NULL);
-  dec_ret = aper_decode(NULL,
+  asn_codec_ctx_t st = {.max_stack_size = 100 * 1000}; // if we enable asn1c debug the stack size become large
-                        &asn_DEF_NGAP_NGAP_PDU,
+  dec_ret = aper_decode(&st, &asn_DEF_NGAP_NGAP_PDU, (void **)&pdu, buffer, length, 0, 0);
-                        (void **)&pdu,
-                        buffer,
-                        length,
-                        0,
-                        0);
  if (dec_ret.code != RC_OK) {
    NGAP_ERROR("Failed to decode pdu\n");

--- a/openair3/NGAP/ngap_gNB_defs.h
+++ b/openair3/NGAP/ngap_gNB_defs.h
@@ -236,11 +236,6 @@ typedef struct ngap_gNB_instance_s {
  /* Tree of NGAP AMF associations ordered by association ID */
  RB_HEAD(ngap_amf_map, ngap_gNB_amf_data_s) ngap_amf_head;
-  /* TODO: add a map ordered by relative AMF capacity */
-  /* Tree of UE ordered by gNB_ue_ngap_id's */
-  RB_HEAD(ngap_ue_map, ngap_gNB_ue_context_s) ngap_ue_head;
  /* For virtual mode, mod_id as defined in the rest of the L1/L2 stack */
  instance_t instance;

--- a/openair3/NGAP/ngap_gNB_encoder.c
+++ b/openair3/NGAP/ngap_gNB_encoder.c
@@ -38,186 +38,98 @@
 #include "ngap_common.h"
 #include "ngap_gNB_encoder.h"
-static inline int ngap_gNB_encode_initiating(NGAP_NGAP_PDU_t *pdu,
+static inline int ngap_gNB_encode_initiating(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
-    uint8_t **buffer,
+{
-    uint32_t *len);
-static inline int ngap_gNB_encode_successfull_outcome(NGAP_NGAP_PDU_t *pdu,
-    uint8_t **buffer, uint32_t *len);
-static inline int ngap_gNB_encode_unsuccessfull_outcome(NGAP_NGAP_PDU_t *pdu,
-    uint8_t **buffer, uint32_t *len);
-int ngap_gNB_encode_pdu(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len) {
-  int ret = -1;
  DevAssert(pdu != NULL);
-  DevAssert(buffer != NULL);
-  DevAssert(len != NULL);
-  switch(pdu->present) {
-    case NGAP_NGAP_PDU_PR_initiatingMessage:
-      ret = ngap_gNB_encode_initiating(pdu, buffer, len);
-      break;
-    case NGAP_NGAP_PDU_PR_successfulOutcome:
-      ret = ngap_gNB_encode_successfull_outcome(pdu, buffer, len);
-      break;
-    case NGAP_NGAP_PDU_PR_unsuccessfulOutcome:
+  const NGAP_ProcedureCode_t tmp[] = {NGAP_ProcedureCode_id_NGSetup,
-      ret = ngap_gNB_encode_unsuccessfull_outcome(pdu, buffer, len);
+                                      NGAP_ProcedureCode_id_UplinkNASTransport,
-      break;
+                                      NGAP_ProcedureCode_id_UERadioCapabilityInfoIndication,
+                                      NGAP_ProcedureCode_id_InitialUEMessage,
-    default:
+                                      NGAP_ProcedureCode_id_NASNonDeliveryIndication,
-      NGAP_DEBUG("Unknown message outcome (%d) or not implemented",
+                                      NGAP_ProcedureCode_id_UEContextReleaseRequest,
-                 (int)pdu->present);
+                                      NGAP_ProcedureCode_id_PathSwitchRequest,
-      return -1;
+                                      NGAP_ProcedureCode_id_PDUSessionResourceModifyIndication};
+  int i;
+  for (i = 0; i < sizeofArray(tmp); i++)
+    if (pdu->choice.initiatingMessage->procedureCode == tmp[i])
+      break;
+  if (i == sizeofArray(tmp)) {
+    NGAP_DEBUG("Unknown procedure ID (%d) for initiating message\n", (int)pdu->choice.initiatingMessage->procedureCode);
+    return -1;
  }
-  //ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, pdu);
+  asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-  return ret;
+  *buffer = res.buffer;
+  *len = res.result.encoded;
+  return 0;
 }
-static inline
+static inline int ngap_gNB_encode_successfull_outcome(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
-int ngap_gNB_encode_initiating(NGAP_NGAP_PDU_t *pdu,
+{
-                               uint8_t **buffer, uint32_t *len) {
-  asn_encode_to_new_buffer_result_t res = { NULL, {0, NULL, NULL} };
  DevAssert(pdu != NULL);
+  const NGAP_ProcedureCode_t tmp[] = {NGAP_ProcedureCode_id_InitialContextSetup,
-  switch(pdu->choice.initiatingMessage->procedureCode) {
+                                      NGAP_ProcedureCode_id_UEContextRelease,
-    case NGAP_ProcedureCode_id_NGSetup:
+                                      NGAP_ProcedureCode_id_PDUSessionResourceSetup,
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
+                                      NGAP_ProcedureCode_id_PDUSessionResourceModify,
-      free(res.buffer);
+                                      NGAP_ProcedureCode_id_PDUSessionResourceRelease};
-      break;
+  int i;
+  for (i = 0; i < sizeofArray(tmp); i++)
-    case NGAP_ProcedureCode_id_UplinkNASTransport:
+    if (pdu->choice.successfulOutcome->procedureCode == tmp[i])
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
+      break;
-      free(res.buffer);
+  if (i == sizeofArray(tmp)) {
-      break;
+    NGAP_WARN("Unknown procedure ID (%d) for successfull outcome message\n", (int)pdu->choice.successfulOutcome->procedureCode);
+    return -1;
-    case NGAP_ProcedureCode_id_UERadioCapabilityInfoIndication:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      break;
-    case NGAP_ProcedureCode_id_InitialUEMessage:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      break;
-    case NGAP_ProcedureCode_id_NASNonDeliveryIndication:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      break;
-    case NGAP_ProcedureCode_id_UEContextReleaseRequest:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      break;
-    case NGAP_ProcedureCode_id_PathSwitchRequest:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      break;
-    case NGAP_ProcedureCode_id_PDUSessionResourceModifyIndication:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      break;
-    default:
-      NGAP_DEBUG("Unknown procedure ID (%d) for initiating message\n",
-                 (int)pdu->choice.initiatingMessage->procedureCode);
-      return -1;
  }
-  if (asn1_xer_print) {
+  asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-    xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, (void *)pdu);
-  }
-  memset(&res, 0, sizeof(res));
-  res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
  *buffer = res.buffer;
  *len = res.result.encoded;
  return 0;
 }
-static inline
+static inline int ngap_gNB_encode_unsuccessfull_outcome(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
-int ngap_gNB_encode_successfull_outcome(NGAP_NGAP_PDU_t *pdu,
+{
-                                        uint8_t **buffer, uint32_t *len) {
-  asn_encode_to_new_buffer_result_t res = { NULL, {0, NULL, NULL} };
  DevAssert(pdu != NULL);
-  switch(pdu->choice.successfulOutcome->procedureCode) {
+  if (pdu->choice.unsuccessfulOutcome->procedureCode != NGAP_ProcedureCode_id_InitialContextSetup) {
-    case NGAP_ProcedureCode_id_InitialContextSetup:
+    NGAP_DEBUG("Unknown procedure ID (%d) for unsuccessfull outcome message\n", (int)pdu->choice.unsuccessfulOutcome->procedureCode);
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
+    return -1;
-      free(res.buffer);
-      break;
-    case NGAP_ProcedureCode_id_UEContextRelease:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      break;
-    case NGAP_ProcedureCode_id_PDUSessionResourceSetup:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      NGAP_INFO("PDUSESSIONSetup successful message\n");
-      break;
-    case NGAP_ProcedureCode_id_PDUSessionResourceModify:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      NGAP_INFO("PDUSESSIONModify successful message\n");
-      break;
-    case NGAP_ProcedureCode_id_PDUSessionResourceRelease:
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-      free(res.buffer);
-      NGAP_INFO("PDUSESSION Release successful message\n");
-      break;
-    default:
-      NGAP_WARN("Unknown procedure ID (%d) for successfull outcome message\n",
-                (int)pdu->choice.successfulOutcome->procedureCode);
-      return -1;
  }
-  if (asn1_xer_print) {
+  asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-    xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, (void *)pdu);
-  }
-  memset(&res, 0, sizeof(res));
-  res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
  *buffer = res.buffer;
  *len = res.result.encoded;
  return 0;
 }
-static inline
+int ngap_gNB_encode_pdu(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
-int ngap_gNB_encode_unsuccessfull_outcome(NGAP_NGAP_PDU_t *pdu,
+{
-    uint8_t **buffer, uint32_t *len) {
+  int ret = -1;
-  asn_encode_to_new_buffer_result_t res = { NULL, {0, NULL, NULL} };
  DevAssert(pdu != NULL);
+  DevAssert(buffer != NULL);
+  DevAssert(len != NULL);
+  if (asn1_xer_print) {
+    xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, (void *)pdu);
+  }
+  switch (pdu->present) {
+    case NGAP_NGAP_PDU_PR_initiatingMessage:
+      ret = ngap_gNB_encode_initiating(pdu, buffer, len);
+      break;
-  switch(pdu->choice.unsuccessfulOutcome->procedureCode) {
+    case NGAP_NGAP_PDU_PR_successfulOutcome:
-    case NGAP_ProcedureCode_id_InitialContextSetup:
+      ret = ngap_gNB_encode_successfull_outcome(pdu, buffer, len);
-      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
+      break;
-      free(res.buffer);
+    case NGAP_NGAP_PDU_PR_unsuccessfulOutcome:
+      ret = ngap_gNB_encode_unsuccessfull_outcome(pdu, buffer, len);
      break;
    default:
-      NGAP_DEBUG("Unknown procedure ID (%d) for unsuccessfull outcome message\n",
+      NGAP_DEBUG("Unknown message outcome (%d) or not implemented", (int)pdu->present);
-                 (int)pdu->choice.unsuccessfulOutcome->procedureCode);
      return -1;
  }
-  if (asn1_xer_print) {
+  ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, pdu);
-    xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, (void *)pdu);
+  return ret;
-  }
-  memset(&res, 0, sizeof(res));
-  res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
-  *buffer = res.buffer;
-  *len = res.result.encoded;
-  return 0;
 }
--- a/openair3/NGAP/ngap_gNB_handlers.c
+++ b/openair3/NGAP/ngap_gNB_handlers.c
@@ -48,119 +48,15 @@
 #include "conversions.h"
 #include "NGAP_NonDynamic5QIDescriptor.h"
-static int ngap_gNB_handle_ng_setup_response(uint32_t ssoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu);
+static void allocCopy(ngap_pdu_t *out, OCTET_STRING_t in)
-static
+{
-int ngap_gNB_handle_ng_setup_failure(uint32_t               assoc_id,
+  if (in.size) {
-                                     uint32_t               stream,
+    out->buffer = malloc(in.size);
-                                     NGAP_NGAP_PDU_t       *pdu);
+    memcpy(out->buffer, in.buf, in.size);
+    out->length = in.size;
-static
+  }
-int ngap_gNB_handle_error_indication(uint32_t               assoc_id,
+}
-                                     uint32_t               stream,
-                                     NGAP_NGAP_PDU_t       *pdu);
-static
-int ngap_gNB_handle_initial_context_request(uint32_t               assoc_id,
-    uint32_t               stream,
-    NGAP_NGAP_PDU_t       *pdu);
-static
-int ngap_gNB_handle_ue_context_release_command(uint32_t               assoc_id,
-    uint32_t               stream,
-    NGAP_NGAP_PDU_t       *pdu);
-static
-int ngap_gNB_handle_pdusession_setup_request(uint32_t               assoc_id,
-                                        uint32_t               stream,
-                                        NGAP_NGAP_PDU_t       *pdu);
-static
-int ngap_gNB_handle_paging(uint32_t               assoc_id,
-                           uint32_t               stream,
-                           NGAP_NGAP_PDU_t       *pdu);
-static
-int ngap_gNB_handle_pdusession_modify_request(uint32_t               assoc_id,
-    uint32_t               stream,
-    NGAP_NGAP_PDU_t       *pdu);
-static
-int ngap_gNB_handle_pdusession_release_command(uint32_t               assoc_id,
-    uint32_t               stream,
-    NGAP_NGAP_PDU_t       *pdu);
-static
-int ngap_gNB_handle_ng_path_switch_request_ack(uint32_t               assoc_id,
-    uint32_t               stream,
-    NGAP_NGAP_PDU_t       *pdu);
-static
-int ngap_gNB_handle_ng_path_switch_request_failure(uint32_t               assoc_id,
-    uint32_t               stream,
-    NGAP_NGAP_PDU_t       *pdu);
-static
-int ngap_gNB_handle_ng_ENDC_pdusession_modification_confirm(uint32_t               assoc_id,
-    uint32_t               stream,
-    NGAP_NGAP_PDU_t       *pdu);
-/* Handlers matrix. Only gNB related procedure present here */
-ngap_message_decoded_callback ngap_messages_callback[][3] = {
-  { 0, 0, 0 }, /* AMFConfigurationUpdate */
-  { 0, 0, 0 }, /* AMFStatusIndication */
-  { 0, 0, 0 }, /* CellTrafficTrace */
-  { ngap_gNB_handle_deactivate_trace, 0, 0 }, /* DeactivateTrace */
-  { ngap_gNB_handle_nas_downlink, 0, 0 }, /* DownlinkNASTransport */
-  { 0, 0, 0 }, /* DownlinkNonUEAssociatedNRPPaTransport */
-  { 0, 0, 0 }, /* DownlinkRANConfigurationTransfer */
-  { 0, 0, 0 }, /* DownlinkRANStatusTransfer */
-  { 0, 0, 0 }, /* DownlinkUEAssociatedNRPPaTransport */
-  { ngap_gNB_handle_error_indication, 0, 0 }, /* ErrorIndication */
-  { 0, 0, 0 }, /* HandoverCancel */
-  { 0, 0, 0 }, /* HandoverNotification */
-  { 0, 0, 0 }, /* HandoverPreparation */
-  { 0, 0, 0 }, /* HandoverResourceAllocation */
-  { ngap_gNB_handle_initial_context_request, 0, 0 }, /* InitialContextSetup */
-  { 0, 0, 0 }, /* InitialUEMessage */
-  { 0, 0, 0 }, /* LocationReportingControl */
-  { 0, 0, 0 }, /* LocationReportingFailureIndication */
-  { 0, 0, 0 }, /* LocationReport */
-  { 0, 0, 0 }, /* NASNonDeliveryIndication */
-  { 0, 0, 0 }, /* NGReset */
-  { 0, ngap_gNB_handle_ng_setup_response, ngap_gNB_handle_ng_setup_failure }, /* NGSetup */
-  { 0, 0, 0 }, /* OverloadStart */
-  { 0, 0, 0 }, /* OverloadStop */
-  { ngap_gNB_handle_paging, 0, 0 }, /* Paging */
-  { 0, ngap_gNB_handle_ng_path_switch_request_ack, ngap_gNB_handle_ng_path_switch_request_failure }, /* PathSwitchRequest */
-  { ngap_gNB_handle_pdusession_modify_request, 0, 0 }, /* PDUSessionResourceModify */
-  { 0, ngap_gNB_handle_ng_ENDC_pdusession_modification_confirm, 0 }, /* PDUSessionResourceModifyIndication */
-  { ngap_gNB_handle_pdusession_release_command, 0, 0 }, /* PDUSessionResourceRelease */
-  { ngap_gNB_handle_pdusession_setup_request, 0, 0 }, /* PDUSessionResourceSetup */
-  { 0, 0, 0 }, /* PDUSessionResourceNotify */
-  { 0, 0, 0 }, /* PrivateMessage */
-  { 0, 0, 0 }, /* PWSCancel */
-  { 0, 0, 0 }, /* PWSFailureIndication */
-  { 0, 0, 0 }, /* PWSRestartIndication */
-  { 0, 0, 0 }, /* RANConfigurationUpdate */
-  { 0, 0, 0 }, /* RerouteNASRequest */
-  { 0, 0, 0 }, /* RRCInactiveTransitionReport */
-  { 0, 0, 0 }, /* TraceFailureIndication */
-  { ngap_gNB_handle_trace_start, 0, 0 }, /* TraceStart */
-  { 0, 0, 0 }, /* UEContextModification */
-  { ngap_gNB_handle_ue_context_release_command, 0, 0 }, /* UEContextRelease */
-  { 0, 0, 0 }, /* UEContextReleaseRequest */
-  { 0, 0, 0 }, /* UERadioCapabilityCheck */
-  { 0, 0, 0 }, /* UERadioCapabilityInfoIndication */
-  { 0, 0, 0 }, /* UETNLABindingRelease */
-  { 0, 0, 0 }, /* UplinkNASTransport */
-  { 0, 0, 0 }, /* UplinkNonUEAssociatedNRPPaTransport */
-  { 0, 0, 0 }, /* UplinkRANConfigurationTransfer */
-  { 0, 0, 0 }, /* UplinkRANStatusTransfer */
-  { 0, 0, 0 }, /* UplinkUEAssociatedNRPPaTransport */
-  { 0, 0, 0 }, /* WriteReplaceWarning */
-  { 0, 0, 0 }, /* SecondaryRATDataUsageReport */
-};
 char *ngap_direction2String(int ngap_dir) {
  static char *ngap_direction_String[] = {
    "", /* Nothing */
@@ -209,46 +105,6 @@ void ngap_handle_ng_setup_message(ngap_gNB_amf_data_t *amf_desc_p, int sctp_shut
  }
 }
-int ngap_gNB_handle_message(uint32_t assoc_id, int32_t stream,
-                            const uint8_t *const data, const uint32_t data_length) {
-  NGAP_NGAP_PDU_t pdu;
-  int ret;
-  DevAssert(data != NULL);
-  memset(&pdu, 0, sizeof(pdu));
-  if (ngap_gNB_decode_pdu(&pdu, data, data_length) < 0) {
-    NGAP_ERROR("Failed to decode PDU\n");
-    return -1;
-  }
-  /* Checking procedure Code and direction of message */
-  if (pdu.choice.initiatingMessage->procedureCode >= sizeof(ngap_messages_callback) / (3 * sizeof(
-        ngap_message_decoded_callback))
-      || (pdu.present > NGAP_NGAP_PDU_PR_unsuccessfulOutcome)) {
-    NGAP_ERROR("[SCTP %d] Either procedureCode %ld or direction %d exceed expected\n",
-               assoc_id, pdu.choice.initiatingMessage->procedureCode, pdu.present);
-    ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, &pdu);
-    return -1;
-  }
-  /* No handler present.
-   * This can mean not implemented or no procedure for gNB (wrong direction).
-   */
-  if (ngap_messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1] == NULL) {
-    NGAP_ERROR("[SCTP %d] No handler for procedureCode %ld in %s\n",
-               assoc_id, pdu.choice.initiatingMessage->procedureCode,
-               ngap_direction2String(pdu.present - 1));
-    ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, &pdu);
-    return -1;
-  }
-  /* Calling the right handler */
-  ret = (*ngap_messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1])
-        (assoc_id, stream, &pdu);
-  ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, &pdu);
-  return ret;
-}
 static
 int ngap_gNB_handle_ng_setup_failure(uint32_t               assoc_id,
                                     uint32_t               stream,
@@ -378,10 +234,8 @@ int ngap_gNB_handle_ng_setup_response(uint32_t               assoc_id,
                             NGAP_ProtocolIE_ID_id_AMFName, true);
  if (ie) {
-    amf_desc_p->amf_name = calloc(ie->value.choice.AMFName.size + 1, sizeof(char));
+    amf_desc_p->amf_name = malloc(ie->value.choice.AMFName.size + 1);
-    memcpy(amf_desc_p->amf_name, ie->value.choice.AMFName.buf,
+    memcpy(amf_desc_p->amf_name, ie->value.choice.AMFName.buf, ie->value.choice.AMFName.size);
-           ie->value.choice.AMFName.size);
-    /* Convert the amf name to a printable string */
    amf_desc_p->amf_name[ie->value.choice.AMFName.size] = '\0';
  }
@@ -831,11 +685,9 @@ int ngap_gNB_handle_initial_context_request(uint32_t   assoc_id,
    NGAP_NGAP_PDU_t       *pdu) {
  int i;
-  ngap_gNB_amf_data_t   *amf_desc_p       = NULL;
+  ngap_gNB_amf_data_t *amf_desc_p = NULL;
-  ngap_gNB_ue_context_t *ue_desc_p        = NULL;
  NGAP_InitialContextSetupRequest_t    *container;
  NGAP_InitialContextSetupRequestIEs_t *ie;
-  NGAP_RAN_UE_NGAP_ID_t    ran_ue_ngap_id;
  uint64_t                 amf_ue_ngap_id;
  DevAssert(pdu != NULL);
  container = &pdu->choice.initiatingMessage->value.choice.InitialContextSetupRequest;
@@ -850,27 +702,20 @@ int ngap_gNB_handle_initial_context_request(uint32_t   assoc_id,
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+  asn_INTEGER2ulong(&(ie->value.choice.AMF_UE_NGAP_ID), &amf_ue_ngap_id);
-    asn_INTEGER2ulong(&(ie->value.choice.AMF_UE_NGAP_ID), &amf_ue_ngap_id);
-  } else {
-    return -1;
-  }
  /* id-RAN-UE-NGAP-ID */
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+  const NGAP_RAN_UE_NGAP_ID_t ran_ue_ngap_id = ie->value.choice.RAN_UE_NGAP_ID;
-    ran_ue_ngap_id = ie->value.choice.RAN_UE_NGAP_ID;
+  ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(ran_ue_ngap_id);
+  if (!ue_desc_p) {
-    if ((ue_desc_p = ngap_gNB_get_ue_context(amf_desc_p->ngap_gNB_instance,
+    NGAP_ERROR(
-                     ran_ue_ngap_id)) == NULL) {
+        "[SCTP %d] Received initial context setup request for non "
-      NGAP_ERROR("[SCTP %d] Received initial context setup request for non "
+        "existing UE context 0x%06lx\n",
-                 "existing UE context 0x%06lx\n", assoc_id,
+        assoc_id,
-                 ran_ue_ngap_id);
+        ran_ue_ngap_id);
-      return -1;
-    }
-  } else {
    return -1;
  }
@@ -886,8 +731,9 @@ int ngap_gNB_handle_initial_context_request(uint32_t   assoc_id,
  MessageDef *message_p = itti_alloc_new_message(TASK_NGAP, 0, NGAP_INITIAL_CONTEXT_SETUP_REQ);
  ngap_initial_context_setup_req_t * msg=&NGAP_INITIAL_CONTEXT_SETUP_REQ(message_p);
-  msg->ue_initial_id  = ue_desc_p->ue_initial_id;
+  memset(msg, 0, sizeof(*msg));
-  ue_desc_p->ue_initial_id = 0;
+  msg->gNB_ue_ngap_id = ue_desc_p->gNB_ue_ngap_id;
+  ue_desc_p->gNB_ue_ngap_id = 0;
  msg->gNB_ue_ngap_id = ue_desc_p->gNB_ue_ngap_id;
  msg->amf_ue_ngap_id = ue_desc_p->amf_ue_ngap_id;
  /* id-UEAggregateMaximumBitRate */
@@ -908,154 +754,26 @@ int ngap_gNB_handle_initial_context_request(uint32_t   assoc_id,
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_GUAMI, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
    TBCD_TO_MCC_MNC(&ie->value.choice.GUAMI.pLMNIdentity, msg->guami.mcc,
                    msg->guami.mnc, msg->guami.mnc_len);
    OCTET_STRING_TO_INT8(&ie->value.choice.GUAMI.aMFRegionID, msg->guami.amf_region_id);
    OCTET_STRING_TO_INT16(&ie->value.choice.GUAMI.aMFSetID, msg->guami.amf_set_id);
    OCTET_STRING_TO_INT8(&ie->value.choice.GUAMI.aMFPointer, msg->guami.amf_pointer);
-  } else {/* ie != NULL */
-    return -1;
-  }
-  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container,
+    NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container, NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListCxtReq, false);
-                             NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListCxtReq, false);
+    if (ie != NULL) {
+      msg->nb_of_pdusessions = ie->value.choice.PDUSessionResourceSetupListCxtReq.list.count;
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+      for (i = 0; i < ie->value.choice.PDUSessionResourceSetupListCxtReq.list.count; i++) {
-    msg->nb_of_pdusessions =
+        NGAP_PDUSessionResourceSetupItemCxtReq_t *item_p = ie->value.choice.PDUSessionResourceSetupListCxtReq.list.array[i];
-      ie->value.choice.PDUSessionResourceSetupListCxtReq.list.count;
+        msg->pdusession_param[i].pdusession_id = item_p->pDUSessionID;
-    for (i = 0; i < ie->value.choice.PDUSessionResourceSetupListCxtReq.list.count; i++) {
-      NGAP_PDUSessionResourceSetupItemCxtReq_t *item_p;
-      asn_dec_rval_t                           dec_rval;
-      NGAP_PDUSessionResourceSetupRequestTransfer_t *pdusessionTransfer_p = NULL;
-      NGAP_PDUSessionResourceSetupRequestTransferIEs_t *pdusessionTransfer_ies = NULL;
-      item_p = (NGAP_PDUSessionResourceSetupItemCxtReq_t *)ie->value.choice.PDUSessionResourceSetupListCxtReq.list.array[i];
-      msg->pdusession_param[i].pdusession_id = item_p->pDUSessionID;
-      if (item_p->nAS_PDU != NULL) {
-        /* Only copy NAS pdu if present */
-        msg->pdusession_param[i].nas_pdu.length = item_p->nAS_PDU->size;
-        msg->pdusession_param[i].nas_pdu.buffer =
-          malloc(sizeof(uint8_t) * item_p->nAS_PDU->size);
-        memcpy(msg->pdusession_param[i].nas_pdu.buffer,
-               item_p->nAS_PDU->buf, item_p->nAS_PDU->size);
-        NGAP_DEBUG("Received NAS message with the PDUSESSION setup procedure\n");
-      } else {
-        msg->pdusession_param[i].nas_pdu.length = 0;
-        msg->pdusession_param[i].nas_pdu.buffer = NULL;
-      }
-      dec_rval = aper_decode(NULL,
-                               &asn_DEF_NGAP_PDUSessionResourceSetupRequestTransfer,
-                               (void **)&pdusessionTransfer_p,
-                               item_p->pDUSessionResourceSetupRequestTransfer.buf,
-                               item_p->pDUSessionResourceSetupRequestTransfer.size, 0, 0);
-      if(dec_rval.code != RC_OK) {
+        allocCopy(&msg->pdusession_param[i].nas_pdu, *item_p->nAS_PDU);
-        NGAP_ERROR("could not decode PDUSessionResourceSetupRequestTransfer\n");
+        allocCopy(&msg->pdusession_param[i].pdusessionTransfer, item_p->pDUSessionResourceSetupRequestTransfer);
-        return -1;
-      }
-      for(int j=0; j< pdusessionTransfer_p->protocolIEs.list.count; j++) {
-        pdusessionTransfer_ies = pdusessionTransfer_p->protocolIEs.list.array[j];
-        switch(pdusessionTransfer_ies->id) {
-          /* optional PDUSessionAggregateMaximumBitRate */
-          case NGAP_ProtocolIE_ID_id_PDUSessionAggregateMaximumBitRate:
-            break;
-          /* mandatory UL-NGU-UP-TNLInformation */
-          case NGAP_ProtocolIE_ID_id_UL_NGU_UP_TNLInformation:
-            {
-              NGAP_GTPTunnel_t  *gTPTunnel_p;
-              gTPTunnel_p = pdusessionTransfer_ies->value.choice.UPTransportLayerInformation.choice.gTPTunnel;
-              /* Set the transport layer address */
-              memcpy(msg->pdusession_param[i].upf_addr.buffer,
-                     gTPTunnel_p->transportLayerAddress.buf, gTPTunnel_p->transportLayerAddress.size);
-              msg->pdusession_param[i].upf_addr.length =
-                gTPTunnel_p->transportLayerAddress.size * 8 - gTPTunnel_p->transportLayerAddress.bits_unused;
-              /* GTP tunnel endpoint ID */
-              OCTET_STRING_TO_INT32(&gTPTunnel_p->gTP_TEID, msg->pdusession_param[i].gtp_teid);
-            }
-            break;
-          /* optional AdditionalUL-NGU-UP-TNLInformation */
-          case NGAP_ProtocolIE_ID_id_AdditionalUL_NGU_UP_TNLInformation:
-            break;
-          /* optional DataForwardingNotPossible */
-          case NGAP_ProtocolIE_ID_id_DataForwardingNotPossible:
-            break;
-          /* mandatory PDUSessionType */
-          case NGAP_ProtocolIE_ID_id_PDUSessionType:
-            msg->pdusession_param[i].upf_addr.pdu_session_type = (uint8_t)pdusessionTransfer_ies->value.choice.PDUSessionType;
-            break;
-          /* optional SecurityIndication */
-          case NGAP_ProtocolIE_ID_id_SecurityIndication:
-            break;
-          /* optional NetworkInstance */
-          case NGAP_ProtocolIE_ID_id_NetworkInstance:
-            break;
-          /* mandatory QosFlowSetupRequestList */
-          case NGAP_ProtocolIE_ID_id_QosFlowSetupRequestList:
-            {
-              NGAP_QosFlowSetupRequestItem_t *qosFlowItem_p;
-              NGAP_DEBUG("QosFlowSetupRequestList.list.count %d\n", pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count);
-              DevAssert(pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count > 0);
-              DevAssert(pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count <= NGAP_maxnoofQosFlows);
-              msg->pdusession_param[i].nb_qos = pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count;
-              for(int qosIdx = 0; qosIdx < pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count; qosIdx++) {
-                qosFlowItem_p = pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.array[qosIdx];
-                /* Set the QOS informations */
-                msg->pdusession_param[i].qos[qosIdx].qfi = (uint8_t)qosFlowItem_p->qosFlowIdentifier;
-                if(qosFlowItem_p->qosFlowLevelQosParameters.qosCharacteristics.present == NGAP_QosCharacteristics_PR_nonDynamic5QI){
-                  if(qosFlowItem_p->qosFlowLevelQosParameters.qosCharacteristics.choice.nonDynamic5QI != NULL){
-                    msg->pdusession_param[i].qos[qosIdx].fiveQI =
-                        (uint64_t)qosFlowItem_p->qosFlowLevelQosParameters.qosCharacteristics.choice.nonDynamic5QI->fiveQI;
-                  }
-                }
-                msg->pdusession_param[i].qos[qosIdx].allocation_retention_priority.priority_level =
-                  qosFlowItem_p->qosFlowLevelQosParameters.allocationAndRetentionPriority.priorityLevelARP;
-                msg->pdusession_param[i].qos[qosIdx].allocation_retention_priority.pre_emp_capability =
-                  qosFlowItem_p->qosFlowLevelQosParameters.allocationAndRetentionPriority.pre_emptionCapability;
-                msg->pdusession_param[i].qos[qosIdx].allocation_retention_priority.pre_emp_vulnerability =
-                  qosFlowItem_p->qosFlowLevelQosParameters.allocationAndRetentionPriority.pre_emptionVulnerability;
-              }
-            }
-            break;
-          /* optional CommonNetworkInstance */
-          case NGAP_ProtocolIE_ID_id_CommonNetworkInstance:
-            break;
-          default:
-            NGAP_ERROR("Not found protocolIEs id %ld\n", pdusessionTransfer_ies->id);
-            return -1;
-        }
      }
+    }
-    } /* for i... */
-  } else {/* ie != NULL */
-    NGAP_ERROR("Not found NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListCxtReq\n");
-  }
  /* id-AllowedNSSAI */
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container,
                               NGAP_ProtocolIE_ID_id_AllowedNSSAI, true);
@@ -1071,20 +789,8 @@ int ngap_gNB_handle_initial_context_request(uint32_t   assoc_id,
        NGAP_WARN("AllowedNSSAI not present, forging 2 NSSAI\n");
    	msg->nb_allowed_nssais = 2;
+      msg->allowed_nssai[0] = (ngap_allowed_NSSAI_t){.sST = 01, .sD_flag = 1, .sD = {1, 2, 3}};
-    	msg->allowed_nssai[0].sST = 01;
+      msg->allowed_nssai[1] = (ngap_allowed_NSSAI_t){.sST = 01, .sD_flag = 1, .sD = {0, 0, 1}};
-    	msg->allowed_nssai[0].sD_flag = 1;
-    	msg->allowed_nssai[0].sD[0] = 01;
-    	msg->allowed_nssai[0].sD[1] = 02;
-    	msg->allowed_nssai[0].sD[2] = 03;
-    	msg->allowed_nssai[1].sST = 01;
-    	msg->allowed_nssai[1].sD_flag = 1;
-    	msg->allowed_nssai[1].sD[0] = 00;//11;
-    	msg->allowed_nssai[1].sD[1] = 00;//22;
-    	msg->allowed_nssai[1].sD[2] = 01;//33;
    } else {
    NGAP_INFO("AllowedNSSAI.list.count %d\n", ie->value.choice.AllowedNSSAI.list.count);
    msg->nb_allowed_nssais = ie->value.choice.AllowedNSSAI.list.count;
@@ -1101,69 +807,43 @@ int ngap_gNB_handle_initial_context_request(uint32_t   assoc_id,
        msg->allowed_nssai[i].sD[2] = allow_nssai_item_p->s_NSSAI.sD->buf[2];
      }
    }
-   }
+    }
-  //} else {/* ie != NULL */
-  //  return -1;
-  //}
  /* id-UESecurityCapabilities */
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_UESecurityCapabilities, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
    msg->security_capabilities.nRencryption_algorithms =
      BIT_STRING_to_uint16(&ie->value.choice.UESecurityCapabilities.nRencryptionAlgorithms);
    msg->security_capabilities.nRintegrity_algorithms =
      BIT_STRING_to_uint16(&ie->value.choice.UESecurityCapabilities.nRintegrityProtectionAlgorithms);
    msg->security_capabilities.eUTRAencryption_algorithms =
      BIT_STRING_to_uint16(&ie->value.choice.UESecurityCapabilities.eUTRAencryptionAlgorithms);
-    msg->security_capabilities.eUTRAintegrity_algorithms =
+    msg->security_capabilities.eUTRAintegrity_algorithms = BIT_STRING_to_uint16(&ie->value.choice.UESecurityCapabilities.eUTRAintegrityProtectionAlgorithms);
-      BIT_STRING_to_uint16(&ie->value.choice.UESecurityCapabilities.eUTRAintegrityProtectionAlgorithms);
-  } else {/* ie != NULL */
-    return -1;
-  }
-  /* id-SecurityKey : Copy the security key */
+    /* id-SecurityKey : Copy the security key */
-  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container,
+    NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container, NGAP_ProtocolIE_ID_id_SecurityKey, true);
-                             NGAP_ProtocolIE_ID_id_SecurityKey, true);
+    memcpy(&msg->security_key, ie->value.choice.SecurityKey.buf, ie->value.choice.SecurityKey.size);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+    /* id-MobilityRestrictionList */
-    memcpy(&msg->security_key,
+    NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container, NGAP_ProtocolIE_ID_id_MobilityRestrictionList, false);
-           ie->value.choice.SecurityKey.buf, ie->value.choice.SecurityKey.size);
-  } else {/* ie != NULL */
-    return -1;
-  }
-  /* id-MobilityRestrictionList */
+    if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
-  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container,
+      NGAP_MobilityRestrictionList_t *mobility_rest_list_p = NULL;
-                               NGAP_ProtocolIE_ID_id_MobilityRestrictionList, false);
+      mobility_rest_list_p = &ie->value.choice.MobilityRestrictionList;
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+      msg->mobility_restriction_flag = 1;
-    NGAP_MobilityRestrictionList_t *mobility_rest_list_p = NULL;
+      TBCD_TO_MCC_MNC(
-    mobility_rest_list_p = &ie->value.choice.MobilityRestrictionList;
+          &mobility_rest_list_p->servingPLMN, msg->mobility_restriction.serving_plmn.mcc, msg->mobility_restriction.serving_plmn.mnc, msg->mobility_restriction.serving_plmn.mnc_digit_length);
-    msg->mobility_restriction_flag   = 1;
-    TBCD_TO_MCC_MNC(&mobility_rest_list_p->servingPLMN, 
-                    msg->mobility_restriction.serving_plmn.mcc,
-                    msg->mobility_restriction.serving_plmn.mnc, 
-                    msg->mobility_restriction.serving_plmn.mnc_digit_length);
  } 
  /* id-NAS-PDU */
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_InitialContextSetupRequestIEs_t, ie, container,
                                 NGAP_ProtocolIE_ID_id_NAS_PDU, false);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+  if (ie)
-    if(ie->value.choice.NAS_PDU.size > 0) {
+    allocCopy(&msg->nas_pdu, ie->value.choice.NAS_PDU);
-      msg->nas_pdu_flag   = 1;
-      msg->nas_pdu.length = ie->value.choice.NAS_PDU.size;
-      msg->nas_pdu.buffer = malloc(sizeof(uint8_t) * ie->value.choice.NAS_PDU.size);
-      memcpy(msg->nas_pdu.buffer,
-             ie->value.choice.NAS_PDU.buf, ie->value.choice.NAS_PDU.size);
-    }
-  } 
  itti_send_msg_to_task(TASK_RRC_GNB, ue_desc_p->gNB_instance->instance, message_p);
@@ -1175,9 +855,7 @@ static
 int ngap_gNB_handle_ue_context_release_command(uint32_t   assoc_id,
    uint32_t               stream,
    NGAP_NGAP_PDU_t       *pdu) {
+  ngap_gNB_amf_data_t *amf_desc_p = NULL;
-  ngap_gNB_amf_data_t   *amf_desc_p       = NULL;
-  ngap_gNB_ue_context_t *ue_desc_p        = NULL;
  MessageDef            *message_p        = NULL;
  uint64_t                            amf_ue_ngap_id;
  NGAP_RAN_UE_NGAP_ID_t               gnb_ue_ngap_id;
@@ -1195,47 +873,43 @@ int ngap_gNB_handle_ue_context_release_command(uint32_t   assoc_id,
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_UEContextReleaseCommand_IEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_UE_NGAP_IDs, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+  switch (ie->value.choice.UE_NGAP_IDs.present) {
-    switch (ie->value.choice.UE_NGAP_IDs.present) {
+    case NGAP_UE_NGAP_IDs_PR_uE_NGAP_ID_pair:
-      case NGAP_UE_NGAP_IDs_PR_uE_NGAP_ID_pair:
+      gnb_ue_ngap_id = ie->value.choice.UE_NGAP_IDs.choice.uE_NGAP_ID_pair->rAN_UE_NGAP_ID;
-        gnb_ue_ngap_id = ie->value.choice.UE_NGAP_IDs.choice.uE_NGAP_ID_pair->rAN_UE_NGAP_ID;
+      asn_INTEGER2ulong(&(ie->value.choice.UE_NGAP_IDs.choice.uE_NGAP_ID_pair->aMF_UE_NGAP_ID), &amf_ue_ngap_id);
-        asn_INTEGER2ulong(&(ie->value.choice.UE_NGAP_IDs.choice.uE_NGAP_ID_pair->aMF_UE_NGAP_ID), &amf_ue_ngap_id);
+      ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(gnb_ue_ngap_id);
+      if (!ue_desc_p) {
-        if ((ue_desc_p = ngap_gNB_get_ue_context(amf_desc_p->ngap_gNB_instance,
+        NGAP_ERROR(
-                         gnb_ue_ngap_id)) == NULL) {
+            "[SCTP %d] Received UE context release command for non "
-          NGAP_ERROR("[SCTP %d] Received UE context release command for non "
+            "existing UE context 0x%06lx\n",
-                     "existing UE context 0x%06lx\n",
+            assoc_id,
-                     assoc_id,
+            gnb_ue_ngap_id);
-                     gnb_ue_ngap_id);
+        return -1;
-          return -1;
+      } else {
-        } else {
+        message_p = itti_alloc_new_message(TASK_NGAP, 0, NGAP_UE_CONTEXT_RELEASE_COMMAND);
-          message_p    = itti_alloc_new_message(TASK_NGAP, 0, NGAP_UE_CONTEXT_RELEASE_COMMAND);
+        if (ue_desc_p->amf_ue_ngap_id == 0) { // case of Detach Request and switch off from RRC_IDLE mode
-          if (ue_desc_p->amf_ue_ngap_id == 0) { // case of Detach Request and switch off from RRC_IDLE mode
+          ue_desc_p->amf_ue_ngap_id = amf_ue_ngap_id;
-            ue_desc_p->amf_ue_ngap_id = amf_ue_ngap_id;
-          }
-          NGAP_UE_CONTEXT_RELEASE_COMMAND(message_p).gNB_ue_ngap_id = gnb_ue_ngap_id;
-          itti_send_msg_to_task(TASK_RRC_GNB, ue_desc_p->gNB_instance->instance, message_p);
-          return 0;
        }
-        break;
+        NGAP_UE_CONTEXT_RELEASE_COMMAND(message_p).gNB_ue_ngap_id = gnb_ue_ngap_id;
+        itti_send_msg_to_task(TASK_RRC_GNB, ue_desc_p->gNB_instance->instance, message_p);
+        return 0;
+      }
+      break;
      //#warning "TODO mapping amf_ue_ngap_id  gnb_ue_ngap_id?"
-      case NGAP_UE_NGAP_IDs_PR_aMF_UE_NGAP_ID:
+    case NGAP_UE_NGAP_IDs_PR_aMF_UE_NGAP_ID:
-        asn_INTEGER2ulong(&(ie->value.choice.UE_NGAP_IDs.choice.aMF_UE_NGAP_ID), &amf_ue_ngap_id);
+      asn_INTEGER2ulong(&(ie->value.choice.UE_NGAP_IDs.choice.aMF_UE_NGAP_ID), &amf_ue_ngap_id);
-        NGAP_ERROR("TO DO mapping amf_ue_ngap_id  gnb_ue_ngap_id");
+      NGAP_ERROR("TO DO mapping amf_ue_ngap_id  gnb_ue_ngap_id");
-        (void)amf_ue_ngap_id; /* TODO: remove - it's to remove gcc warning about unused var */
+      (void)amf_ue_ngap_id; /* TODO: remove - it's to remove gcc warning about unused var */
-      case NGAP_UE_NGAP_IDs_PR_NOTHING:
+    case NGAP_UE_NGAP_IDs_PR_NOTHING:
-      default:
+    default:
-        NGAP_ERROR("NGAP_UE_CONTEXT_RELEASE_COMMAND not processed, missing info elements");
+      NGAP_ERROR("NGAP_UE_CONTEXT_RELEASE_COMMAND not processed, missing info elements");
-        return -1;
+      return -1;
-    }
-  } else {
-    return -1;
  }
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_UEContextReleaseCommand_IEs_t, ie, container,
@@ -1253,7 +927,7 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t         assoc_id,
  uint64_t                      amf_ue_ngap_id;
  NGAP_RAN_UE_NGAP_ID_t         ran_ue_ngap_id;
  ngap_gNB_amf_data_t          *amf_desc_p       = NULL;
-  ngap_gNB_ue_context_t        *ue_desc_p        = NULL;
  NGAP_PDUSessionResourceSetupRequest_t     *container;
  NGAP_PDUSessionResourceSetupRequestIEs_t  *ie;
  DevAssert(pdu != NULL);
@@ -1266,40 +940,21 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t         assoc_id,
  }
  /* id-AMF-UE-NGAP-ID */
-  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container,
+  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container, NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID, true);
-                             NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID, true);
+  asn_INTEGER2ulong(&(ie->value.choice.AMF_UE_NGAP_ID), &amf_ue_ngap_id);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
-     asn_INTEGER2ulong(&(ie->value.choice.AMF_UE_NGAP_ID), &amf_ue_ngap_id);
-  } else {
-    return -1;
-  }
  /* id-gNB-UE-NGAP-ID */
-  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container,
+  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container, NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID, true);
-                         NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID, true);
+  ran_ue_ngap_id = ie->value.choice.RAN_UE_NGAP_ID;
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
-    ran_ue_ngap_id = ie->value.choice.RAN_UE_NGAP_ID;
-  } else {
-    return -1;
-  }
-  if ((ue_desc_p = ngap_gNB_get_ue_context(amf_desc_p->ngap_gNB_instance,
+  ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(ran_ue_ngap_id);
-                   ran_ue_ngap_id)) == NULL) {
+  if (!ue_desc_p) {
    NGAP_ERROR("[SCTP %d] Received pdu session resource setup request for non "
               "existing UE context 0x%06lx\n", assoc_id,
               ran_ue_ngap_id);
    return -1;
  }
-  /* Initial context request = UE-related procedure -> stream != 0 */
-  // if (stream == 0) {
-  //   NGAP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n",
-  //              assoc_id, stream);
-  //   return -1;
-  // }
  ue_desc_p->rx_stream = stream;
  if ( ue_desc_p->amf_ue_ngap_id != amf_ue_ngap_id) {
@@ -1309,8 +964,9 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t         assoc_id,
  MessageDef * message_p = itti_alloc_new_message(TASK_NGAP, 0, NGAP_PDUSESSION_SETUP_REQ);
  ngap_pdusession_setup_req_t * msg=&NGAP_PDUSESSION_SETUP_REQ(message_p);
-  msg->ue_initial_id   = ue_desc_p->ue_initial_id;
+  memset(msg, 0, sizeof(*msg));
-  ue_desc_p->ue_initial_id = 0;
+  msg->gNB_ue_ngap_id = ue_desc_p->gNB_ue_ngap_id;
+  ue_desc_p->gNB_ue_ngap_id = 0;
  msg->gNB_ue_ngap_id = ue_desc_p->gNB_ue_ngap_id;
  msg->amf_ue_ngap_id = ue_desc_p->amf_ue_ngap_id;
@@ -1325,18 +981,11 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t         assoc_id,
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container,
                         NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListSUReq, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
    msg->nb_pdusessions_tosetup =
      ie->value.choice.PDUSessionResourceSetupListSUReq.list.count;
    for (int i = 0; i < ie->value.choice.PDUSessionResourceSetupListSUReq.list.count; i++) {
-      NGAP_PDUSessionResourceSetupItemSUReq_t          *item_p;
+      NGAP_PDUSessionResourceSetupItemSUReq_t *item_p = ie->value.choice.PDUSessionResourceSetupListSUReq.list.array[i];
-      asn_dec_rval_t                                   dec_rval;
-      NGAP_PDUSessionResourceSetupRequestTransfer_t    *pdusessionTransfer_p   = NULL;
-      NGAP_PDUSessionResourceSetupRequestTransferIEs_t *pdusessionTransfer_ies = NULL;
-      // PDU session ID
-      item_p = (NGAP_PDUSessionResourceSetupItemSUReq_t *)ie->value.choice.PDUSessionResourceSetupListSUReq.list.array[i];
      msg->pdusession_setup_params[i].pdusession_id = item_p->pDUSessionID;
      // S-NSSAI
@@ -1348,124 +997,11 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t         assoc_id,
        msg->allowed_nssai[i].sD[2] = item_p->s_NSSAI.sD->buf[2];
      }
-      // check for the NAS PDU
+      allocCopy(&msg->pdusession_setup_params[i].nas_pdu, *item_p->pDUSessionNAS_PDU);
-      if (item_p->pDUSessionNAS_PDU->size > 0 ) {
+      allocCopy(&msg->pdusession_setup_params[i].pdusessionTransfer, item_p->pDUSessionResourceSetupRequestTransfer);
-        msg->pdusession_setup_params[i].nas_pdu.length = item_p->pDUSessionNAS_PDU->size;
+    }
-        msg->pdusession_setup_params[i].nas_pdu.buffer = malloc(sizeof(uint8_t) * item_p->pDUSessionNAS_PDU->size);
-        memcpy(msg->pdusession_setup_params[i].nas_pdu.buffer,
-               item_p->pDUSessionNAS_PDU->buf, item_p->pDUSessionNAS_PDU->size);
-        // NGAP_INFO("received a NAS PDU with size %d (%02x.%02x)\n",msg->pdusession_setup_params[i].nas_pdu.length, item_p->nAS_PDU.buf[0], item_p->nAS_PDU.buf[1]);
-      } else {
-        msg->pdusession_setup_params[i].nas_pdu.length = 0;
-        msg->pdusession_setup_params[i].nas_pdu.buffer = NULL;
-        NGAP_WARN("NAS PDU is not provided, generate a PDUSESSION_SETUP Failure (TBD) back to AMF \n");
-      }
-      dec_rval = aper_decode(NULL,
-                               &asn_DEF_NGAP_PDUSessionResourceSetupRequestTransfer,
-                               (void **)&pdusessionTransfer_p,
-                               item_p->pDUSessionResourceSetupRequestTransfer.buf,
-                               item_p->pDUSessionResourceSetupRequestTransfer.size, 0, 0);
-      if(dec_rval.code != RC_OK) {
-        NGAP_ERROR("could not decode PDUSessionResourceSetupRequestTransfer\n");
-        return -1;
-      }
-      for(int j=0; j< pdusessionTransfer_p->protocolIEs.list.count; j++) {
-        pdusessionTransfer_ies = pdusessionTransfer_p->protocolIEs.list.array[j];
-        switch(pdusessionTransfer_ies->id) {
-          /* optional PDUSessionAggregateMaximumBitRate */
-          case NGAP_ProtocolIE_ID_id_PDUSessionAggregateMaximumBitRate:
-            break;
-          /* mandatory UL-NGU-UP-TNLInformation */
-          case NGAP_ProtocolIE_ID_id_UL_NGU_UP_TNLInformation:
-          {
-          	NGAP_GTPTunnel_t  *gTPTunnel_p;
-              gTPTunnel_p = pdusessionTransfer_ies->value.choice.UPTransportLayerInformation.choice.gTPTunnel;
-              /* The transport layer address for the IP packets */
-              OCTET_STRING_TO_INT32(&gTPTunnel_p->gTP_TEID, msg->pdusession_setup_params[i].gtp_teid);
-              msg->pdusession_setup_params[i].upf_addr.length =
-              		gTPTunnel_p->transportLayerAddress.size * 8 - gTPTunnel_p->transportLayerAddress.bits_unused;
-              memcpy(msg->pdusession_setup_params[i].upf_addr.buffer ,
-              		gTPTunnel_p->transportLayerAddress.buf, gTPTunnel_p->transportLayerAddress.size);
-          }
-            break;
-          /* optional AdditionalUL-NGU-UP-TNLInformation */
-          case NGAP_ProtocolIE_ID_id_AdditionalUL_NGU_UP_TNLInformation:
-            break;
-          /* optional DataForwardingNotPossible */
-          case NGAP_ProtocolIE_ID_id_DataForwardingNotPossible:
-            break;
-          /* mandatory PDUSessionType */
-          case NGAP_ProtocolIE_ID_id_PDUSessionType:
-            msg->pdusession_setup_params[i].upf_addr.pdu_session_type = (uint8_t)pdusessionTransfer_ies->value.choice.PDUSessionType;
-            break;
-          /* optional SecurityIndication */
-          case NGAP_ProtocolIE_ID_id_SecurityIndication:
-            break;
-          /* optional NetworkInstance */
-          case NGAP_ProtocolIE_ID_id_NetworkInstance:
-            break;
-          /* mandatory QosFlowSetupRequestList */
-          case NGAP_ProtocolIE_ID_id_QosFlowSetupRequestList:
-          {
-            NGAP_QosFlowSetupRequestItem_t *qosFlowItem_p;
-            NGAP_DEBUG("servedGUAMIs.list.count %d\n", pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count);
-            DevAssert(pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count > 0);
-            DevAssert(pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count <= NGAP_maxnoofQosFlows);
-            msg->pdusession_setup_params[i].nb_qos = pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count;
-            for(int qosIdx = 0; qosIdx < pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.count; qosIdx++){
-              qosFlowItem_p = pdusessionTransfer_ies->value.choice.QosFlowSetupRequestList.list.array[qosIdx];
-              /* Set the QOS informations */
-              msg->pdusession_setup_params[i].qos[qosIdx].qfi = (uint8_t)qosFlowItem_p->qosFlowIdentifier;
-              if(qosFlowItem_p->qosFlowLevelQosParameters.qosCharacteristics.present == NGAP_QosCharacteristics_PR_nonDynamic5QI){
-                msg->pdusession_setup_params[i].qos[qosIdx].fiveQI_type = non_dynamic;
-                if(qosFlowItem_p->qosFlowLevelQosParameters.qosCharacteristics.choice.nonDynamic5QI != NULL){
-                  msg->pdusession_setup_params[i].qos[qosIdx].fiveQI = 
-                    (uint64_t)qosFlowItem_p->qosFlowLevelQosParameters.qosCharacteristics.choice.nonDynamic5QI->fiveQI;
-                }
-              } else if (qosFlowItem_p->qosFlowLevelQosParameters.qosCharacteristics.present == NGAP_QosCharacteristics_PR_dynamic5QI)
-              {
-                msg->pdusession_setup_params[i].qos[qosIdx].fiveQI_type = dynamic;
-              }
-              msg->pdusession_setup_params[i].qos[qosIdx].allocation_retention_priority.priority_level =
-                qosFlowItem_p->qosFlowLevelQosParameters.allocationAndRetentionPriority.priorityLevelARP;
-              msg->pdusession_setup_params[i].qos[qosIdx].allocation_retention_priority.pre_emp_capability =
-                qosFlowItem_p->qosFlowLevelQosParameters.allocationAndRetentionPriority.pre_emptionCapability;
-              msg->pdusession_setup_params[i].qos[qosIdx].allocation_retention_priority.pre_emp_vulnerability =
-                qosFlowItem_p->qosFlowLevelQosParameters.allocationAndRetentionPriority.pre_emptionVulnerability;
-            }
-          }
-          break;
-          /* optional CommonNetworkInstance */
-          case NGAP_ProtocolIE_ID_id_CommonNetworkInstance:
-            break;
-          default:
-            NGAP_ERROR("could not found protocolIEs id %ld\n", pdusessionTransfer_ies->id);
-            return -1;
-        }
-      }/* for j... */
-    } /* for i... */
    itti_send_msg_to_task(TASK_RRC_GNB, ue_desc_p->gNB_instance->instance, message_p);
-  }else {/* ie == NULL */
-    NGAP_ERROR("could not found NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListSUReq\n");
-    return -1;
-  }
  return 0;
 }
@@ -1507,64 +1043,47 @@ int ngap_gNB_handle_paging(uint32_t               assoc_id,
   MessageDef *message_p = itti_alloc_new_message(TASK_NGAP, 0, NGAP_PAGING_IND);
   ngap_paging_ind_t * msg=&NGAP_PAGING_IND(message_p);
+   memset(msg, 0, sizeof(*msg));
-  /* convert NGAP_PagingIEs_t to ngap_paging_ind_t */
-  /* id-UEIdentityIndexValue : convert UE Identity Index value */
+   /* convert NGAP_PagingIEs_t to ngap_paging_ind_t */
-  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PagingIEs_t, ie, container,
+   /* id-UEIdentityIndexValue : convert UE Identity Index value */
-                             NGAP_ProtocolIE_ID_id_UEPagingIdentity, true);
+   NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PagingIEs_t, ie, container, NGAP_ProtocolIE_ID_id_UEPagingIdentity, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+   struct NGAP_FiveG_S_TMSI *fiveG_S_TMSI = ie->value.choice.UEPagingIdentity.choice.fiveG_S_TMSI;
-    OCTET_STRING_TO_INT16(&ie->value.choice.UEPagingIdentity.choice.fiveG_S_TMSI->aMFSetID, msg->ue_paging_identity.s_tmsi.amf_set_id);
+   OCTET_STRING_TO_INT16(&fiveG_S_TMSI->aMFSetID, msg->ue_paging_identity.s_tmsi.amf_set_id);
-    OCTET_STRING_TO_INT8(&ie->value.choice.UEPagingIdentity.choice.fiveG_S_TMSI->aMFPointer, msg->ue_paging_identity.s_tmsi.amf_pointer);
+   OCTET_STRING_TO_INT8(&fiveG_S_TMSI->aMFPointer, msg->ue_paging_identity.s_tmsi.amf_pointer);
-    OCTET_STRING_TO_INT32(&ie->value.choice.UEPagingIdentity.choice.fiveG_S_TMSI->fiveG_TMSI, msg->ue_paging_identity.s_tmsi.m_tmsi);
+   OCTET_STRING_TO_INT32(&fiveG_S_TMSI->fiveG_TMSI, msg->ue_paging_identity.s_tmsi.m_tmsi);
-    NGAP_DEBUG("[SCTP %d] Received Paging Identity amf_set_id %d, amf_pointer %d, m_tmsi %d\n",
+   NGAP_DEBUG("[SCTP %d] Received Paging Identity amf_set_id %d, amf_pointer %d, m_tmsi %d\n",
-               assoc_id,
+              assoc_id,
-               msg->ue_paging_identity.s_tmsi.amf_set_id,
+              msg->ue_paging_identity.s_tmsi.amf_set_id,
-               msg->ue_paging_identity.s_tmsi.amf_pointer,
+              msg->ue_paging_identity.s_tmsi.amf_pointer,
-               msg->ue_paging_identity.s_tmsi.m_tmsi);
+              msg->ue_paging_identity.s_tmsi.m_tmsi);
-  } else {
-    return -1;
+   msg->paging_drx = NGAP_PAGING_DRX_256;
-  }
+   /* id-pagingDRX */
+   NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PagingIEs_t, ie, container, NGAP_ProtocolIE_ID_id_PagingDRX, false);
-  msg->paging_drx = NGAP_PAGING_DRX_256;
+   /* optional */
-  /* id-pagingDRX */
+   if (ie) {
-  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PagingIEs_t, ie, container,
+     msg->paging_drx = ie->value.choice.PagingDRX;
-                             NGAP_ProtocolIE_ID_id_PagingDRX, false);
+   } else {
+     msg->paging_drx = NGAP_PAGING_DRX_256;
-  /* optional */
+   }
-  if (ie) {
-    msg->paging_drx = ie->value.choice.PagingDRX;
-  } else {
-    msg->paging_drx = NGAP_PAGING_DRX_256;
-  }
-  memset (&msg->plmn_identity[0], 0, sizeof(plmn_identity_t)*256);
-  memset (&msg->tac[0], 0, sizeof(int16_t)*256);
-  msg->tai_size = 0;
  /* id-TAIList */
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PagingIEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_TAIListForPaging, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+  NGAP_INFO("[SCTP %d] Received Paging taiList For Paging: count %d\n", assoc_id, ie->value.choice.TAIListForPaging.list.count);
-    NGAP_INFO("[SCTP %d] Received Paging taiList For Paging: count %d\n", assoc_id, ie->value.choice.TAIListForPaging.list.count);
+  for (int i = 0; i < ie->value.choice.TAIListForPaging.list.count; i++) {
-    for (int i = 0; i < ie->value.choice.TAIListForPaging.list.count; i++) {
+    NGAP_TAIListForPagingItem_t *item_p;
-      NGAP_TAIListForPagingItem_t *item_p;
+    item_p = (NGAP_TAIListForPagingItem_t *)ie->value.choice.TAIListForPaging.list.array[i];
-      item_p = (NGAP_TAIListForPagingItem_t *)ie->value.choice.TAIListForPaging.list.array[i];
+    TBCD_TO_MCC_MNC(&(item_p->tAI.pLMNIdentity), msg->plmn_identity[i].mcc, msg->plmn_identity[i].mnc, msg->plmn_identity[i].mnc_digit_length);
-      TBCD_TO_MCC_MNC(&(item_p->tAI.pLMNIdentity), msg->plmn_identity[i].mcc,
+    OCTET_STRING_TO_INT16(&(item_p->tAI.tAC), msg->tac[i]);
-                      msg->plmn_identity[i].mnc,
+    msg->tai_size++;
-                      msg->plmn_identity[i].mnc_digit_length);
+    NGAP_DEBUG("[SCTP %d] Received Paging: MCC %d, MNC %d, TAC %d\n", assoc_id, msg->plmn_identity[i].mcc, msg->plmn_identity[i].mnc, msg->tac[i]);
-      OCTET_STRING_TO_INT16(&(item_p->tAI.tAC), msg->tac[i]);
-      msg->tai_size++;
-      NGAP_DEBUG("[SCTP %d] Received Paging: MCC %d, MNC %d, TAC %d\n", assoc_id,
-                 msg->plmn_identity[i].mcc,
-                 msg->plmn_identity[i].mnc,
-                 msg->tac[i]);
-    }
-  } else {
-    return -1;
  }
  //paging parameter values
@@ -1579,14 +1098,9 @@ int ngap_gNB_handle_paging(uint32_t               assoc_id,
  return 0;
 }
-static
+static int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu)
-int ngap_gNB_handle_pdusession_modify_request(uint32_t               assoc_id,
+{
-    uint32_t               stream,
+  ngap_gNB_amf_data_t *amf_desc_p = NULL;
-    NGAP_NGAP_PDU_t       *pdu) {
-  int i, nb_of_pdusessions_failed;
-  ngap_gNB_amf_data_t           *amf_desc_p       = NULL;
-  ngap_gNB_ue_context_t         *ue_desc_p        = NULL;
  NGAP_PDUSessionResourceModifyRequest_t     *container;
  NGAP_PDUSessionResourceModifyRequestIEs_t  *ie;
  NGAP_RAN_UE_NGAP_ID_t         gnb_ue_ngap_id;
@@ -1614,184 +1128,70 @@ int ngap_gNB_handle_pdusession_modify_request(uint32_t               assoc_id,
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceModifyRequestIEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
    gnb_ue_ngap_id = ie->value.choice.RAN_UE_NGAP_ID;
-  } else {
+    ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(gnb_ue_ngap_id);
-    return -1;
+    if (!ue_desc_p) {
-  }
+      NGAP_ERROR(
+          "[SCTP %d] Received PDUSession Resource modify request for non "
-  if ((ue_desc_p = ngap_gNB_get_ue_context(amf_desc_p->ngap_gNB_instance,
+          "existing UE context 0x%08lx\n",
-                   gnb_ue_ngap_id)) == NULL) {
+          assoc_id,
-    NGAP_ERROR("[SCTP %d] Received PDUSession Resource modify request for non "
+          gnb_ue_ngap_id);
-               "existing UE context 0x%08lx\n", assoc_id,
+      return -1;
-               gnb_ue_ngap_id);
+    }
-    return -1;
-  }
  ue_desc_p->rx_stream = stream;
+  /* id-PDUSessionResourceModifyListModReq */
+  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceModifyRequestIEs_t, ie, container, NGAP_ProtocolIE_ID_id_PDUSessionResourceModifyListModReq, true);
  if (ue_desc_p->amf_ue_ngap_id != amf_ue_ngap_id) {
    NGAP_WARN("UE context amf_ue_ngap_id is different form that of the message (%ld != %ld)",
              (uint64_t)ue_desc_p->amf_ue_ngap_id, amf_ue_ngap_id);
    MessageDef *message_p = itti_alloc_new_message (TASK_RRC_GNB, 0, NGAP_PDUSESSION_MODIFY_RESP);
    ngap_pdusession_modify_resp_t* msg=&NGAP_PDUSESSION_MODIFY_RESP(message_p);
+    memset(msg, 0, sizeof(*msg));
    msg->gNB_ue_ngap_id = gnb_ue_ngap_id;
-    NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceModifyRequestIEs_t, ie, container,
+    for (int nb_of_pdusessions_failed = 0; nb_of_pdusessions_failed < ie->value.choice.PDUSessionResourceModifyListModReq.list.count; nb_of_pdusessions_failed++) {
-                               NGAP_ProtocolIE_ID_id_PDUSessionResourceModifyListModReq, true);
+      NGAP_PDUSessionResourceModifyItemModReq_t *item_p;
+      item_p = (NGAP_PDUSessionResourceModifyItemModReq_t *)ie->value.choice.PDUSessionResourceModifyListModReq.list.array[nb_of_pdusessions_failed];
-    if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+      pdusession_failed_t *tmp = &msg->pdusessions_failed[nb_of_pdusessions_failed];
-      for(nb_of_pdusessions_failed = 0; nb_of_pdusessions_failed < ie->value.choice.PDUSessionResourceModifyListModReq.list.count; nb_of_pdusessions_failed++) {
+      tmp->pdusession_id = item_p->pDUSessionID;
-        NGAP_PDUSessionResourceModifyItemModReq_t *item_p;
+      tmp->cause = NGAP_Cause_PR_radioNetwork;
-        item_p = (NGAP_PDUSessionResourceModifyItemModReq_t *)ie->value.choice.PDUSessionResourceModifyListModReq.list.array[nb_of_pdusessions_failed];
+      tmp->cause_value = NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID;
-        msg->pdusessions_failed[nb_of_pdusessions_failed].pdusession_id = item_p->pDUSessionID;
-        msg->pdusessions_failed[nb_of_pdusessions_failed].cause = NGAP_Cause_PR_radioNetwork;
-        msg->pdusessions_failed[nb_of_pdusessions_failed].cause_value = NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID;
-      }
-    } else {
-      return -1;
    }
+    msg->nb_of_pdusessions_failed = ie->value.choice.PDUSessionResourceModifyListModReq.list.count;
-    msg->nb_of_pdusessions_failed = nb_of_pdusessions_failed;
    ngap_gNB_pdusession_modify_resp(amf_desc_p->ngap_gNB_instance->instance,msg);
-    itti_free(TASK_RRC_GNB,message_p);
+    itti_free(TASK_RRC_GNB, message_p);
-    message_p = NULL;
    return -1;
  }
  MessageDef *message_p = itti_alloc_new_message(TASK_NGAP, 0, NGAP_PDUSESSION_MODIFY_REQ);
  ngap_pdusession_modify_req_t * msg=&NGAP_PDUSESSION_MODIFY_REQ(message_p);
-  msg->ue_initial_id  = ue_desc_p->ue_initial_id;
+  memset(msg, 0, sizeof(*msg));
+  msg->gNB_ue_ngap_id = ue_desc_p->gNB_ue_ngap_id;
  msg->amf_ue_ngap_id  = amf_ue_ngap_id;
-  msg->gNB_ue_ngap_id  = gnb_ue_ngap_id;
+  msg->gNB_ue_ngap_id = gnb_ue_ngap_id;
-  /* id-PDUSessionResourceModifyListModReq */
-  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceModifyRequestIEs_t, ie, container,
-                             NGAP_ProtocolIE_ID_id_PDUSessionResourceModifyListModReq, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+  msg->nb_pdusessions_tomodify = ie->value.choice.PDUSessionResourceModifyListModReq.list.count;
-    msg->nb_pdusessions_tomodify =
-      ie->value.choice.PDUSessionResourceModifyListModReq.list.count;
-    for (i = 0; i < ie->value.choice.PDUSessionResourceModifyListModReq.list.count; i++) {
-      NGAP_PDUSessionResourceModifyItemModReq_t         *item_p;
-      asn_dec_rval_t                                    dec_rval;
-      NGAP_PDUSessionResourceModifyRequestTransfer_t    *pdusessionTransfer_p = NULL;
-      NGAP_PDUSessionResourceModifyRequestTransferIEs_t *pdusessionTransfer_ies = NULL;
-      item_p = (NGAP_PDUSessionResourceModifyItemModReq_t *)ie->value.choice.PDUSessionResourceModifyListModReq.list.array[i];
-      msg->pdusession_modify_params[i].pdusession_id = item_p->pDUSessionID;
-      // check for the NAS PDU
-      if (item_p->nAS_PDU != NULL && item_p->nAS_PDU->size > 0 ) {
-        msg->pdusession_modify_params[i].nas_pdu.length = item_p->nAS_PDU->size;
-        msg->pdusession_modify_params[i].nas_pdu.buffer = malloc(sizeof(uint8_t) * item_p->nAS_PDU->size);
-        memcpy(msg->pdusession_modify_params[i].nas_pdu.buffer,
-               item_p->nAS_PDU->buf, item_p->nAS_PDU->size);
-      } else {
-        msg->pdusession_modify_params[i].nas_pdu.length = 0;
-        msg->pdusession_modify_params[i].nas_pdu.buffer = NULL;
-        continue;
-      }
-      dec_rval = aper_decode(NULL,
+  for (int i = 0; i < ie->value.choice.PDUSessionResourceModifyListModReq.list.count; i++) {
-                             &asn_DEF_NGAP_PDUSessionResourceModifyRequestTransfer,
+    NGAP_PDUSessionResourceModifyItemModReq_t *item_p = ie->value.choice.PDUSessionResourceModifyListModReq.list.array[i];
-                             (void **)&pdusessionTransfer_p,
-                             item_p->pDUSessionResourceModifyRequestTransfer.buf,
-                             item_p->pDUSessionResourceModifyRequestTransfer.size, 0, 0);
-      if(dec_rval.code != RC_OK) {
+    msg->pdusession_modify_params[i].pdusession_id = item_p->pDUSessionID;
-        NGAP_ERROR("could not decode PDUSessionResourceModifyRequestTransfer\n");
-        return -1;
-      }
-      for(int j=0; j< pdusessionTransfer_p->protocolIEs.list.count; j++) {
+    // check for the NAS PDU
-        pdusessionTransfer_ies = pdusessionTransfer_p->protocolIEs.list.array[j];
+    if (item_p->nAS_PDU != NULL && item_p->nAS_PDU->size > 0) {
-        switch(pdusessionTransfer_ies->id) {
+      allocCopy(&msg->pdusession_modify_params[i].nas_pdu, *item_p->nAS_PDU);
-          /* optional PDUSessionAggregateMaximumBitRate */
+      allocCopy(&msg->pdusession_modify_params[i].pdusessionTransfer, item_p->pDUSessionResourceModifyRequestTransfer);
-          case NGAP_ProtocolIE_ID_id_PDUSessionAggregateMaximumBitRate:
+    } else {
-            // TODO
+      LOG_W(NGAP, "received pdu session modify with void content for UE %u, pdu session %lu\n", msg->gNB_ue_ngap_id, item_p->pDUSessionID);
-            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_PDUSessionAggregateMaximumBitRate\n");
+      continue;
-            break;
-          /* optional UL-NGU-UP-TNLModifyList */
-          case NGAP_ProtocolIE_ID_id_UL_NGU_UP_TNLModifyList:
-            // TODO
-            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_UL_NGU_UP_TNLModifyList\n");
-            break;
-          /* optional NetworkInstance */
-          case NGAP_ProtocolIE_ID_id_NetworkInstance:
-            // TODO
-            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_NetworkInstance\n");
-            break;
-          /* optional QosFlowAddOrModifyRequestList */
-          case NGAP_ProtocolIE_ID_id_QosFlowAddOrModifyRequestList:
-            {
-              NGAP_QosFlowAddOrModifyRequestItem_t *qosFlowItem_p;
-              NGAP_DEBUG("QosFlowAddOrModifyRequestList.list.count %d\n", pdusessionTransfer_ies->value.choice.QosFlowAddOrModifyRequestList.list.count);
-              DevAssert(pdusessionTransfer_ies->value.choice.QosFlowAddOrModifyRequestList.list.count > 0);
-              DevAssert(pdusessionTransfer_ies->value.choice.QosFlowAddOrModifyRequestList.list.count <= NGAP_maxnoofQosFlows);
-              msg->pdusession_modify_params[i].nb_qos = pdusessionTransfer_ies->value.choice.QosFlowAddOrModifyRequestList.list.count;
-              for(int qosIdx = 0; qosIdx < pdusessionTransfer_ies->value.choice.QosFlowAddOrModifyRequestList.list.count; qosIdx++) {
-                qosFlowItem_p = pdusessionTransfer_ies->value.choice.QosFlowAddOrModifyRequestList.list.array[qosIdx];
-                /* Set the QOS informations */
-                msg->pdusession_modify_params[i].qos[qosIdx].qfi = (uint8_t)qosFlowItem_p->qosFlowIdentifier;
-                if(qosFlowItem_p->qosFlowLevelQosParameters) {
-                  if (qosFlowItem_p->qosFlowLevelQosParameters->qosCharacteristics.present == NGAP_QosCharacteristics_PR_nonDynamic5QI) {
-                    msg->pdusession_modify_params[i].qos[qosIdx].fiveQI =
-                      qosFlowItem_p->qosFlowLevelQosParameters->qosCharacteristics.choice.nonDynamic5QI->fiveQI;
-                  } else if (qosFlowItem_p->qosFlowLevelQosParameters->qosCharacteristics.present == NGAP_QosCharacteristics_PR_dynamic5QI) {
-                    // TODO
-                  }
-                  msg->pdusession_modify_params[i].qos[qosIdx].allocation_retention_priority.priority_level =
-                    qosFlowItem_p->qosFlowLevelQosParameters->allocationAndRetentionPriority.priorityLevelARP;
-                  msg->pdusession_modify_params[i].qos[qosIdx].allocation_retention_priority.pre_emp_capability =
-                    qosFlowItem_p->qosFlowLevelQosParameters->allocationAndRetentionPriority.pre_emptionCapability;
-                  msg->pdusession_modify_params[i].qos[qosIdx].allocation_retention_priority.pre_emp_vulnerability =
-                    qosFlowItem_p->qosFlowLevelQosParameters->allocationAndRetentionPriority.pre_emptionVulnerability;
-                }
-              }
-            }
-            break;
-          /* optional QosFlowToReleaseList */
-          case NGAP_ProtocolIE_ID_id_QosFlowToReleaseList:
-            // TODO
-            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_QosFlowToReleaseList\n");
-            break;
-          /* optional AdditionalUL-NGU-UP-TNLInformation */
-          case NGAP_ProtocolIE_ID_id_AdditionalUL_NGU_UP_TNLInformation:
-            // TODO
-            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_AdditionalUL_NGU_UP_TNLInformation\n");
-            break;
-          /* optional CommonNetworkInstance */
-          case NGAP_ProtocolIE_ID_id_CommonNetworkInstance:
-            // TODO
-            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_CommonNetworkInstance\n");
-            break;
-          default:
-            NGAP_ERROR("could not found protocolIEs id %ld\n", pdusessionTransfer_ies->id);
-            return -1;
-        }
-      }
    }
-    itti_send_msg_to_task(TASK_RRC_GNB, ue_desc_p->gNB_instance->instance, message_p);
-  } else { /* of if (ie != NULL)*/
-    return -1;
  }
+  itti_send_msg_to_task(TASK_RRC_GNB, ue_desc_p->gNB_instance->instance, message_p);
  return 0;
 }
 // handle pdu session release command and send it to rrc_end
 static
 int ngap_gNB_handle_pdusession_release_command(uint32_t               assoc_id,
@@ -1799,8 +1199,7 @@ int ngap_gNB_handle_pdusession_release_command(uint32_t               assoc_id,
    NGAP_NGAP_PDU_t       *pdu) {
  int i;
-  ngap_gNB_amf_data_t   *amf_desc_p       = NULL;
+  ngap_gNB_amf_data_t *amf_desc_p = NULL;
-  ngap_gNB_ue_context_t *ue_desc_p        = NULL;
  NGAP_PDUSessionResourceReleaseCommand_t     *container;
  NGAP_PDUSessionResourceReleaseCommandIEs_t  *ie;
  NGAP_RAN_UE_NGAP_ID_t           gnb_ue_ngap_id;
@@ -1834,20 +1233,13 @@ int ngap_gNB_handle_pdusession_release_command(uint32_t               assoc_id,
    return -1;
  }
-  if ((ue_desc_p = ngap_gNB_get_ue_context(amf_desc_p->ngap_gNB_instance,
+  ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(gnb_ue_ngap_id);
-                   gnb_ue_ngap_id)) == NULL) {
+  if (!ue_desc_p) {
    NGAP_ERROR("[SCTP %d] Received PDUSession Resource release command for non existing UE context 0x%08lx\n", assoc_id,
               ie->value.choice.RAN_UE_NGAP_ID);
    return -1;
  }
-  /* Initial context request = UE-related procedure -> stream != 0 */
-  // if (stream == 0) {
-  //   NGAP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n",
-  //              assoc_id, stream);
-  //   return -1;
-  // }
  ue_desc_p->rx_stream = stream;
  if (ue_desc_p->amf_ue_ngap_id != amf_ue_ngap_id) {
@@ -1859,6 +1251,7 @@ int ngap_gNB_handle_pdusession_release_command(uint32_t               assoc_id,
             assoc_id, gnb_ue_ngap_id, amf_ue_ngap_id);
  MessageDef * message_p = itti_alloc_new_message(TASK_NGAP, 0, NGAP_PDUSESSION_RELEASE_COMMAND);
  ngap_pdusession_release_command_t * msg=&NGAP_PDUSESSION_RELEASE_COMMAND(message_p);
+  memset(msg, 0, sizeof(*msg));
  msg->gNB_ue_ngap_id = gnb_ue_ngap_id;
  msg->amf_ue_ngap_id = amf_ue_ngap_id;
@@ -1866,44 +1259,20 @@ int ngap_gNB_handle_pdusession_release_command(uint32_t               assoc_id,
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceReleaseCommandIEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_NAS_PDU, false);
-  if(ie && ie->value.choice.NAS_PDU.size > 0) {
+  if (ie)
-    msg->nas_pdu.length = ie->value.choice.NAS_PDU.size;
+    allocCopy(&msg->nas_pdu, ie->value.choice.NAS_PDU);
-    msg->nas_pdu.buffer = malloc(sizeof(uint8_t) * ie->value.choice.NAS_PDU.size);
-    memcpy(msg->nas_pdu.buffer,
-           ie->value.choice.NAS_PDU.buf,
-           ie->value.choice.NAS_PDU.size);
-  } else {
-    msg->nas_pdu.length = 0;
-    msg->nas_pdu.buffer = NULL;
-  }
  /* id-PDUSessionResourceToReleaseListRelCmd */
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceReleaseCommandIEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_PDUSessionResourceToReleaseListRelCmd, true);
-  if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */
+  msg->nb_pdusessions_torelease = ie->value.choice.PDUSessionResourceToReleaseListRelCmd.list.count;
-    msg->nb_pdusessions_torelease = ie->value.choice.PDUSessionResourceToReleaseListRelCmd.list.count;
-    for (i = 0; i < ie->value.choice.PDUSessionResourceToReleaseListRelCmd.list.count; i++) {
+  for (i = 0; i < ie->value.choice.PDUSessionResourceToReleaseListRelCmd.list.count; i++) {
-      NGAP_PDUSessionResourceToReleaseItemRelCmd_t *item_p;
+    NGAP_PDUSessionResourceToReleaseItemRelCmd_t *item_p;
-      item_p = (NGAP_PDUSessionResourceToReleaseItemRelCmd_t *)ie->value.choice.PDUSessionResourceToReleaseListRelCmd.list.array[i];
+    item_p = ie->value.choice.PDUSessionResourceToReleaseListRelCmd.list.array[i];
+    msg->pdusession_release_params[i].pdusession_id = item_p->pDUSessionID;
-      msg->pdusession_release_params[i].pdusession_id = item_p->pDUSessionID;
+    allocCopy(&msg->pdusession_release_params[i].data, item_p->pDUSessionResourceReleaseCommandTransfer);
-      if(item_p->pDUSessionResourceReleaseCommandTransfer.size > 0) {
-        msg->pdusession_release_params[i].transfer_length = item_p->pDUSessionResourceReleaseCommandTransfer.size;
-        msg->pdusession_release_params[i].transfer_buffer = malloc(sizeof(uint8_t) * item_p->pDUSessionResourceReleaseCommandTransfer.size);
-        memcpy(msg->pdusession_release_params[i].transfer_buffer,
-               item_p->pDUSessionResourceReleaseCommandTransfer.buf,
-               item_p->pDUSessionResourceReleaseCommandTransfer.size);
-      }else {
-        msg->pdusession_release_params[i].transfer_length = 0;
-        msg->pdusession_release_params[i].transfer_buffer = NULL;
-        NGAP_ERROR("[NGAP] Received pdu session release command for pDUSessionResourceReleaseCommandTransfer is NULL!\n");
-      }
-      NGAP_DEBUG("[NGAP] Received pdu session release command for pDUSessionID id %ld\n", item_p->pDUSessionID);
-    }
-  } else {
-    return -1;
  }
  itti_send_msg_to_task(TASK_RRC_GNB, ue_desc_p->gNB_instance->instance, message_p);
@@ -1937,3 +1306,94 @@ int ngap_gNB_handle_ng_ENDC_pdusession_modification_confirm(uint32_t
 	return 0;
 }
+/* Handlers matrix. Only gNB related procedure present here */
+ngap_message_decoded_callback ngap_messages_callback[][3] = {
+    {0, 0, 0}, /* AMFConfigurationUpdate */
+    {0, 0, 0}, /* AMFStatusIndication */
+    {0, 0, 0}, /* CellTrafficTrace */
+    {ngap_gNB_handle_deactivate_trace, 0, 0}, /* DeactivateTrace */
+    {ngap_gNB_handle_nas_downlink, 0, 0}, /* DownlinkNASTransport */
+    {0, 0, 0}, /* DownlinkNonUEAssociatedNRPPaTransport */
+    {0, 0, 0}, /* DownlinkRANConfigurationTransfer */
+    {0, 0, 0}, /* DownlinkRANStatusTransfer */
+    {0, 0, 0}, /* DownlinkUEAssociatedNRPPaTransport */
+    {ngap_gNB_handle_error_indication, 0, 0}, /* ErrorIndication */
+    {0, 0, 0}, /* HandoverCancel */
+    {0, 0, 0}, /* HandoverNotification */
+    {0, 0, 0}, /* HandoverPreparation */
+    {0, 0, 0}, /* HandoverResourceAllocation */
+    {ngap_gNB_handle_initial_context_request, 0, 0}, /* InitialContextSetup */
+    {0, 0, 0}, /* InitialUEMessage */
+    {0, 0, 0}, /* LocationReportingControl */
+    {0, 0, 0}, /* LocationReportingFailureIndication */
+    {0, 0, 0}, /* LocationReport */
+    {0, 0, 0}, /* NASNonDeliveryIndication */
+    {0, 0, 0}, /* NGReset */
+    {0, ngap_gNB_handle_ng_setup_response, ngap_gNB_handle_ng_setup_failure}, /* NGSetup */
+    {0, 0, 0}, /* OverloadStart */
+    {0, 0, 0}, /* OverloadStop */
+    {ngap_gNB_handle_paging, 0, 0}, /* Paging */
+    {0, ngap_gNB_handle_ng_path_switch_request_ack, ngap_gNB_handle_ng_path_switch_request_failure}, /* PathSwitchRequest */
+    {ngap_gNB_handle_pdusession_modify_request, 0, 0}, /* PDUSessionResourceModify */
+    {0, ngap_gNB_handle_ng_ENDC_pdusession_modification_confirm, 0}, /* PDUSessionResourceModifyIndication */
+    {ngap_gNB_handle_pdusession_release_command, 0, 0}, /* PDUSessionResourceRelease */
+    {ngap_gNB_handle_pdusession_setup_request, 0, 0}, /* PDUSessionResourceSetup */
+    {0, 0, 0}, /* PDUSessionResourceNotify */
+    {0, 0, 0}, /* PrivateMessage */
+    {0, 0, 0}, /* PWSCancel */
+    {0, 0, 0}, /* PWSFailureIndication */
+    {0, 0, 0}, /* PWSRestartIndication */
+    {0, 0, 0}, /* RANConfigurationUpdate */
+    {0, 0, 0}, /* RerouteNASRequest */
+    {0, 0, 0}, /* RRCInactiveTransitionReport */
+    {0, 0, 0}, /* TraceFailureIndication */
+    {ngap_gNB_handle_trace_start, 0, 0}, /* TraceStart */
+    {0, 0, 0}, /* UEContextModification */
+    {ngap_gNB_handle_ue_context_release_command, 0, 0}, /* UEContextRelease */
+    {0, 0, 0}, /* UEContextReleaseRequest */
+    {0, 0, 0}, /* UERadioCapabilityCheck */
+    {0, 0, 0}, /* UERadioCapabilityInfoIndication */
+    {0, 0, 0}, /* UETNLABindingRelease */
+    {0, 0, 0}, /* UplinkNASTransport */
+    {0, 0, 0}, /* UplinkNonUEAssociatedNRPPaTransport */
+    {0, 0, 0}, /* UplinkRANConfigurationTransfer */
+    {0, 0, 0}, /* UplinkRANStatusTransfer */
+    {0, 0, 0}, /* UplinkUEAssociatedNRPPaTransport */
+    {0, 0, 0}, /* WriteReplaceWarning */
+    {0, 0, 0}, /* SecondaryRATDataUsageReport */
+};
+int ngap_gNB_handle_message(uint32_t assoc_id, int32_t stream, const uint8_t *const data, const uint32_t data_length)
+{
+  NGAP_NGAP_PDU_t pdu;
+  int ret;
+  DevAssert(data != NULL);
+  memset(&pdu, 0, sizeof(pdu));
+  if (ngap_gNB_decode_pdu(&pdu, data, data_length) < 0) {
+    NGAP_ERROR("Failed to decode PDU\n");
+    return -1;
+  }
+  /* Checking procedure Code and direction of message */
+  if (pdu.choice.initiatingMessage->procedureCode >= sizeof(ngap_messages_callback) / (3 * sizeof(ngap_message_decoded_callback)) || (pdu.present > NGAP_NGAP_PDU_PR_unsuccessfulOutcome)) {
+    NGAP_ERROR("[SCTP %d] Either procedureCode %ld or direction %d exceed expected\n", assoc_id, pdu.choice.initiatingMessage->procedureCode, pdu.present);
+    ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, &pdu);
+    return -1;
+  }
+  /* No handler present.
+   * This can mean not implemented or no procedure for gNB (wrong direction).
+   */
+  if (ngap_messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1] == NULL) {
+    NGAP_ERROR("[SCTP %d] No handler for procedureCode %ld in %s\n", assoc_id, pdu.choice.initiatingMessage->procedureCode, ngap_direction2String(pdu.present - 1));
+    ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, &pdu);
+    return -1;
+  }
+  /* Calling the right handler */
+  ret = (*ngap_messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1])(assoc_id, stream, &pdu);
+  ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, &pdu);
+  return ret;
+}
--- a/openair3/NGAP/ngap_gNB_itti_messaging.c
+++ b/openair3/NGAP/ngap_gNB_itti_messaging.c
@@ -49,11 +49,7 @@ void ngap_gNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uin
  itti_send_msg_to_task(TASK_SCTP, instance, message_p);
 }
-void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance,
+void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance, uint32_t gNB_ue_ngap_id, uint8_t *nas_pdu, uint32_t nas_pdu_length)
-    uint16_t ue_initial_id,
-    uint32_t gNB_ue_ngap_id,
-    uint8_t *nas_pdu,
-    uint32_t nas_pdu_length)
 {
  MessageDef          *message_p;
  ngap_downlink_nas_t *ngap_downlink_nas;
@@ -62,7 +58,6 @@ void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance,
  ngap_downlink_nas = &message_p->ittiMsg.ngap_downlink_nas;
-  ngap_downlink_nas->ue_initial_id  = ue_initial_id;
  ngap_downlink_nas->gNB_ue_ngap_id = gNB_ue_ngap_id;
  ngap_downlink_nas->nas_pdu.buffer = malloc(sizeof(uint8_t) * nas_pdu_length);
  memcpy(ngap_downlink_nas->nas_pdu.buffer, nas_pdu, nas_pdu_length);

--- a/openair3/NGAP/ngap_gNB_itti_messaging.h
+++ b/openair3/NGAP/ngap_gNB_itti_messaging.h
@@ -33,11 +33,7 @@
 void ngap_gNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer,
                                      uint32_t buffer_length, uint16_t stream);
-void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance,
+void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance, uint32_t gNB_ue_ngap_id, uint8_t *nas_pdu, uint32_t nas_pdu_length);
-    uint16_t ue_initial_id,
-    uint32_t gNB_ue_ngap_id,
-    uint8_t *nas_pdu,
-    uint32_t nas_pdu_length);
 void ngap_gNB_itti_send_sctp_close_association(instance_t instance,
    int32_t assoc_id);

--- a/openair3/NGAP/ngap_gNB_nas_procedures.c
+++ b/openair3/NGAP/ngap_gNB_nas_procedures.c
@@ -49,73 +49,80 @@
 #include "ngap_gNB_nas_procedures.h"
 #include "ngap_gNB_management_procedures.h"
+static void allocCopy(OCTET_STRING_t *out, ngap_pdu_t in)
+{
+  if (in.length) {
+    out->buf = malloc(in.length);
+    memcpy(out->buf, in.buffer, in.length);
+    out->size = in.length;
+  }
+}
+static void allocAddrCopy(BIT_STRING_t *out, ngap_transport_layer_addr_t in)
+{
+  if (in.length) {
+    out->buf = malloc(in.length);
+    memcpy(out->buf, in.buffer, in.length);
+    out->size = in.length;
+    out->bits_unused = 0;
+  }
+}
 //------------------------------------------------------------------------------
-int ngap_gNB_handle_nas_first_req(
+int ngap_gNB_handle_nas_first_req(instance_t instance, ngap_nas_first_req_t *UEfirstReq)
-    instance_t instance, ngap_nas_first_req_t *ngap_nas_first_req_p)
 //------------------------------------------------------------------------------
 {
  ngap_gNB_instance_t          *instance_p = NULL;
-  struct ngap_gNB_amf_data_s   *amf_desc_p = NULL;
+  struct ngap_gNB_amf_data_s *amf_desc_p = NULL;
-  struct ngap_gNB_ue_context_s *ue_desc_p  = NULL;
+  NGAP_NGAP_PDU_t pdu;
-  NGAP_NGAP_PDU_t               pdu;
-  NGAP_InitialUEMessage_t      *out;
-  NGAP_InitialUEMessage_IEs_t  *ie;
-  NGAP_UserLocationInformationNR_t *userinfo_nr_p = NULL;
  uint8_t  *buffer = NULL;
  uint32_t  length = 0;
-  DevAssert(ngap_nas_first_req_p != NULL);
+  DevAssert(UEfirstReq != NULL);
  /* Retrieve the NGAP gNB instance associated with Mod_id */
  instance_p = ngap_gNB_get_instance(instance);
  DevAssert(instance_p != NULL);
  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage;
-  pdu.choice.initiatingMessage = (NGAP_InitiatingMessage_t *)calloc(1,sizeof(NGAP_InitiatingMessage_t));
+  asn1cCalloc(pdu.choice.initiatingMessage, head);
-  pdu.choice.initiatingMessage->procedureCode = NGAP_ProcedureCode_id_InitialUEMessage;
+  head->procedureCode = NGAP_ProcedureCode_id_InitialUEMessage;
-  pdu.choice.initiatingMessage->criticality = NGAP_Criticality_ignore;
+  head->criticality = NGAP_Criticality_ignore;
-  pdu.choice.initiatingMessage->value.present = NGAP_InitiatingMessage__value_PR_InitialUEMessage;
+  head->value.present = NGAP_InitiatingMessage__value_PR_InitialUEMessage;
-  out = &pdu.choice.initiatingMessage->value.choice.InitialUEMessage;
+  NGAP_InitialUEMessage_t *out = &head->value.choice.InitialUEMessage;
  /* Select the AMF corresponding to the provided GUAMI. */
  //TODO have not be test. it's should be test
-  if (ngap_nas_first_req_p->ue_identity.presenceMask & NGAP_UE_IDENTITIES_guami) {
+  if (UEfirstReq->ue_identity.presenceMask & NGAP_UE_IDENTITIES_guami) {
-    amf_desc_p = ngap_gNB_nnsf_select_amf_by_guami(
+    amf_desc_p = ngap_gNB_nnsf_select_amf_by_guami(instance_p, UEfirstReq->establishment_cause, UEfirstReq->ue_identity.guami);
-                     instance_p,
-                     ngap_nas_first_req_p->establishment_cause,
-                     ngap_nas_first_req_p->ue_identity.guami);
    if (amf_desc_p) {
-        NGAP_INFO("[gNB %ld] Chose AMF '%s' (assoc_id %d) through GUAMI MCC %d MNC %d AMFRI %d AMFSI %d AMFPT %d\n",
+      NGAP_INFO("[gNB %ld] Chose AMF '%s' (assoc_id %d) through GUAMI MCC %d MNC %d AMFRI %d AMFSI %d AMFPT %d\n",
-                  instance,
+                instance,
-                  amf_desc_p->amf_name,
+                amf_desc_p->amf_name,
-                  amf_desc_p->assoc_id,
+                amf_desc_p->assoc_id,
-                  ngap_nas_first_req_p->ue_identity.guami.mcc,
+                UEfirstReq->ue_identity.guami.mcc,
-                  ngap_nas_first_req_p->ue_identity.guami.mnc,
+                UEfirstReq->ue_identity.guami.mnc,
-                  ngap_nas_first_req_p->ue_identity.guami.amf_region_id,
+                UEfirstReq->ue_identity.guami.amf_region_id,
-                  ngap_nas_first_req_p->ue_identity.guami.amf_set_id,
+                UEfirstReq->ue_identity.guami.amf_set_id,
-                  ngap_nas_first_req_p->ue_identity.guami.amf_pointer);
+                UEfirstReq->ue_identity.guami.amf_pointer);
    }
  }
  if (amf_desc_p == NULL) {
    /* Select the AMF corresponding to the provided s-TMSI. */
    //TODO have not be test. it's should be test
-    if (ngap_nas_first_req_p->ue_identity.presenceMask & NGAP_UE_IDENTITIES_FiveG_s_tmsi) {
+    if (UEfirstReq->ue_identity.presenceMask & NGAP_UE_IDENTITIES_FiveG_s_tmsi) {
-        amf_desc_p = ngap_gNB_nnsf_select_amf_by_amf_setid(
+      amf_desc_p = ngap_gNB_nnsf_select_amf_by_amf_setid(instance_p, UEfirstReq->establishment_cause, UEfirstReq->selected_plmn_identity, UEfirstReq->ue_identity.s_tmsi.amf_set_id);
-                         instance_p,
-                         ngap_nas_first_req_p->establishment_cause,
+      if (amf_desc_p) {
-                         ngap_nas_first_req_p->selected_plmn_identity,
+        NGAP_INFO("[gNB %ld] Chose AMF '%s' (assoc_id %d) through S-TMSI AMFSI %d and selected PLMN Identity index %d MCC %d MNC %d\n",
-                         ngap_nas_first_req_p->ue_identity.s_tmsi.amf_set_id);
+                  instance,
+                  amf_desc_p->amf_name,
-        if (amf_desc_p) {
+                  amf_desc_p->assoc_id,
-            NGAP_INFO("[gNB %ld] Chose AMF '%s' (assoc_id %d) through S-TMSI AMFSI %d and selected PLMN Identity index %d MCC %d MNC %d\n",
+                  UEfirstReq->ue_identity.s_tmsi.amf_set_id,
-                      instance,
+                  UEfirstReq->selected_plmn_identity,
-                      amf_desc_p->amf_name,
+                  instance_p->mcc[UEfirstReq->selected_plmn_identity],
-                      amf_desc_p->assoc_id,
+                  instance_p->mnc[UEfirstReq->selected_plmn_identity]);
-                      ngap_nas_first_req_p->ue_identity.s_tmsi.amf_set_id,
+      }
-                      ngap_nas_first_req_p->selected_plmn_identity,
-                      instance_p->mcc[ngap_nas_first_req_p->selected_plmn_identity],
-                      instance_p->mnc[ngap_nas_first_req_p->selected_plmn_identity]);
-        }
    }
  }
@@ -123,19 +130,16 @@ int ngap_gNB_handle_nas_first_req(
    /* Select AMF based on the selected PLMN identity, received through RRC
     * Connection Setup Complete */
    //TODO have not be test. it's should be test
-    amf_desc_p = ngap_gNB_nnsf_select_amf_by_plmn_id(
+    amf_desc_p = ngap_gNB_nnsf_select_amf_by_plmn_id(instance_p, UEfirstReq->establishment_cause, UEfirstReq->selected_plmn_identity);
-                     instance_p,
-                     ngap_nas_first_req_p->establishment_cause,
-                     ngap_nas_first_req_p->selected_plmn_identity);
    if (amf_desc_p) {
-        NGAP_INFO("[gNB %ld] Chose AMF '%s' (assoc_id %d) through selected PLMN Identity index %d MCC %d MNC %d\n",
+      NGAP_INFO("[gNB %ld] Chose AMF '%s' (assoc_id %d) through selected PLMN Identity index %d MCC %d MNC %d\n",
-                  instance,
+                instance,
-                  amf_desc_p->amf_name,
+                amf_desc_p->amf_name,
-                  amf_desc_p->assoc_id,
+                amf_desc_p->assoc_id,
-                  ngap_nas_first_req_p->selected_plmn_identity,
+                UEfirstReq->selected_plmn_identity,
-                  instance_p->mcc[ngap_nas_first_req_p->selected_plmn_identity],
+                instance_p->mcc[UEfirstReq->selected_plmn_identity],
-                  instance_p->mnc[ngap_nas_first_req_p->selected_plmn_identity]);
+                instance_p->mnc[UEfirstReq->selected_plmn_identity]);
    }
  }
@@ -145,15 +149,10 @@ int ngap_gNB_handle_nas_first_req(
     * identity, selects the AMF with the highest capacity.
     */
    //TODO have not be test. it's should be test
-    amf_desc_p = ngap_gNB_nnsf_select_amf(
+    amf_desc_p = ngap_gNB_nnsf_select_amf(instance_p, UEfirstReq->establishment_cause);
-                     instance_p,
-                     ngap_nas_first_req_p->establishment_cause);
    if (amf_desc_p) {
-        NGAP_INFO("[gNB %ld] Chose AMF '%s' (assoc_id %d) through highest relative capacity\n",
+      NGAP_INFO("[gNB %ld] Chose AMF '%s' (assoc_id %d) through highest relative capacity\n", instance, amf_desc_p->amf_name, amf_desc_p->assoc_id);
-                  instance,
-                  amf_desc_p->amf_name,
-                  amf_desc_p->assoc_id);
    }
  }
@@ -170,120 +169,94 @@ int ngap_gNB_handle_nas_first_req(
  /* The gNB should allocate a unique gNB UE NGAP ID for this UE. The value
   * will be used for the duration of the connectivity.
   */
-  ue_desc_p = ngap_gNB_allocate_new_UE_context();
+  struct ngap_gNB_ue_context_s *ue_desc_p = calloc(1, sizeof(ue_desc_p));
  DevAssert(ue_desc_p != NULL);
  /* Keep a reference to the selected AMF */
  ue_desc_p->amf_ref       = amf_desc_p;
-  ue_desc_p->ue_initial_id = ngap_nas_first_req_p->ue_initial_id;
+  ue_desc_p->gNB_ue_ngap_id = UEfirstReq->gNB_ue_ngap_id;
  ue_desc_p->gNB_instance  = instance_p;
-  ue_desc_p->selected_plmn_identity = ngap_nas_first_req_p->selected_plmn_identity;
+  ue_desc_p->selected_plmn_identity = UEfirstReq->selected_plmn_identity;
-  do {
+  // insert in master table
-    struct ngap_gNB_ue_context_s *collision_p;
+  ngap_store_ue_context(ue_desc_p);
-    /* Peek a random value for the gNB_ue_ngap_id */
-    ue_desc_p->gNB_ue_ngap_id = (random() + random()) & 0xffffffff;
-    if ((collision_p = RB_INSERT(ngap_ue_map, &instance_p->ngap_ue_head, ue_desc_p))
-            == NULL) {
-        NGAP_DEBUG("Found usable gNB_ue_ngap_id: 0x%08x %u(10)\n",
-                   ue_desc_p->gNB_ue_ngap_id,
-                   ue_desc_p->gNB_ue_ngap_id);
-        /* Break the loop as the id is not already used by another UE */
-        break;
-    }
-  } while(1);
  /* mandatory */
-  ie = (NGAP_InitialUEMessage_IEs_t *)calloc(1, sizeof(NGAP_InitialUEMessage_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialUEMessage_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
-  ie->value.choice.RAN_UE_NGAP_ID = ue_desc_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = ue_desc_p->gNB_ue_ngap_id;
+  }
  /* mandatory */
-  ie = (NGAP_InitialUEMessage_IEs_t *)calloc(1, sizeof(NGAP_InitialUEMessage_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_NAS_PDU;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialUEMessage_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_NAS_PDU;
-  ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_NAS_PDU;
+    ie->criticality = NGAP_Criticality_reject;
-#if 1
+    ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_NAS_PDU;
-  ie->value.choice.NAS_PDU.buf = ngap_nas_first_req_p->nas_pdu.buffer;
+    allocCopy(&ie->value.choice.NAS_PDU, UEfirstReq->nas_pdu);
-#else
+  }
-  ie->value.choice.NAS_PDU.buf = malloc(ngap_nas_first_req_p->nas_pdu.length);
-  memcpy(ie->value.choice.NAS_PDU.buf,
-         ngap_nas_first_req_p->nas_pdu.buffer,
-         ngap_nas_first_req_p->nas_pdu.length);
-#endif
-  ie->value.choice.NAS_PDU.size = ngap_nas_first_req_p->nas_pdu.length;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
  /* mandatory */
-  ie = (NGAP_InitialUEMessage_IEs_t *)calloc(1, sizeof(NGAP_InitialUEMessage_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_UserLocationInformation;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialUEMessage_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_UserLocationInformation;
-  ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_UserLocationInformation;
+    ie->criticality = NGAP_Criticality_reject;
+    ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_UserLocationInformation;
-  ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
+    ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
-  ie->value.choice.UserLocationInformation.choice.userLocationInformationNR = 
-      CALLOC(1, sizeof(*ie->value.choice.UserLocationInformation.choice.userLocationInformationNR));
-  userinfo_nr_p = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR;
-  /* Set nRCellIdentity. default userLocationInformationNR */
-  MACRO_GNB_ID_TO_CELL_IDENTITY(instance_p->gNB_id,
-                                    0, // Cell ID
-                                    &userinfo_nr_p->nR_CGI.nRCellIdentity);
-  MCC_MNC_TO_TBCD(instance_p->mcc[ue_desc_p->selected_plmn_identity],
-                  instance_p->mnc[ue_desc_p->selected_plmn_identity],
-                  instance_p->mnc_digit_length[ue_desc_p->selected_plmn_identity],
-                  &userinfo_nr_p->nR_CGI.pLMNIdentity);
-  /* Set TAI */
-  INT24_TO_OCTET_STRING(instance_p->tac, &userinfo_nr_p->tAI.tAC);
-  MCC_MNC_TO_PLMNID(instance_p->mcc[ue_desc_p->selected_plmn_identity],
-                    instance_p->mnc[ue_desc_p->selected_plmn_identity],
-                    instance_p->mnc_digit_length[ue_desc_p->selected_plmn_identity],
-                    &userinfo_nr_p->tAI.pLMNIdentity);
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    asn1cCalloc(ie->value.choice.UserLocationInformation.choice.userLocationInformationNR, userinfo_nr_p);
+    /* Set nRCellIdentity. default userLocationInformationNR */
+    MACRO_GNB_ID_TO_CELL_IDENTITY(instance_p->gNB_id,
+                                  0, // Cell ID
+                                  &userinfo_nr_p->nR_CGI.nRCellIdentity);
+    MCC_MNC_TO_TBCD(instance_p->mcc[ue_desc_p->selected_plmn_identity],
+                    instance_p->mnc[ue_desc_p->selected_plmn_identity],
+                    instance_p->mnc_digit_length[ue_desc_p->selected_plmn_identity],
+                    &userinfo_nr_p->nR_CGI.pLMNIdentity);
+    /* Set TAI */
+    INT24_TO_OCTET_STRING(instance_p->tac, &userinfo_nr_p->tAI.tAC);
+    MCC_MNC_TO_PLMNID(instance_p->mcc[ue_desc_p->selected_plmn_identity],
+                      instance_p->mnc[ue_desc_p->selected_plmn_identity],
+                      instance_p->mnc_digit_length[ue_desc_p->selected_plmn_identity],
+                      &userinfo_nr_p->tAI.pLMNIdentity);
+  }
  /* Set the establishment cause according to those provided by RRC */
-  DevCheck(ngap_nas_first_req_p->establishment_cause < NGAP_RRC_CAUSE_LAST,
+  DevCheck(UEfirstReq->establishment_cause < NGAP_RRC_CAUSE_LAST, UEfirstReq->establishment_cause, NGAP_RRC_CAUSE_LAST, 0);
-           ngap_nas_first_req_p->establishment_cause, NGAP_RRC_CAUSE_LAST, 0);
  /* mandatory */
-  ie = (NGAP_InitialUEMessage_IEs_t *)calloc(1, sizeof(NGAP_InitialUEMessage_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RRCEstablishmentCause;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialUEMessage_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_RRCEstablishmentCause;
-  ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_RRCEstablishmentCause;
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.choice.RRCEstablishmentCause = ngap_nas_first_req_p->establishment_cause;
+    ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_RRCEstablishmentCause;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RRCEstablishmentCause = UEfirstReq->establishment_cause;
+  }
  /* optional */
-  if (ngap_nas_first_req_p->ue_identity.presenceMask & NGAP_UE_IDENTITIES_FiveG_s_tmsi) {
+  if (UEfirstReq->ue_identity.presenceMask & NGAP_UE_IDENTITIES_FiveG_s_tmsi) {
    NGAP_DEBUG("FIVEG_S_TMSI_PRESENT\n");
-    ie = (NGAP_InitialUEMessage_IEs_t *)calloc(1, sizeof(NGAP_InitialUEMessage_IEs_t));
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialUEMessage_IEs_t, ie);
    ie->id = NGAP_ProtocolIE_ID_id_FiveG_S_TMSI;
    ie->criticality = NGAP_Criticality_reject;
    ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_FiveG_S_TMSI;
-    AMF_SETID_TO_BIT_STRING(ngap_nas_first_req_p->ue_identity.s_tmsi.amf_set_id,
+    AMF_SETID_TO_BIT_STRING(UEfirstReq->ue_identity.s_tmsi.amf_set_id, &ie->value.choice.FiveG_S_TMSI.aMFSetID);
-                             &ie->value.choice.FiveG_S_TMSI.aMFSetID);
+    AMF_SETID_TO_BIT_STRING(UEfirstReq->ue_identity.s_tmsi.amf_pointer, &ie->value.choice.FiveG_S_TMSI.aMFPointer);
-    AMF_SETID_TO_BIT_STRING(ngap_nas_first_req_p->ue_identity.s_tmsi.amf_pointer,
+    M_TMSI_TO_OCTET_STRING(UEfirstReq->ue_identity.s_tmsi.m_tmsi, &ie->value.choice.FiveG_S_TMSI.fiveG_TMSI);
-                             &ie->value.choice.FiveG_S_TMSI.aMFPointer);
-    M_TMSI_TO_OCTET_STRING(ngap_nas_first_req_p->ue_identity.s_tmsi.m_tmsi,
-                             &ie->value.choice.FiveG_S_TMSI.fiveG_TMSI);
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
  /* optional */
-  ie = (NGAP_InitialUEMessage_IEs_t *)calloc(1, sizeof(NGAP_InitialUEMessage_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_UEContextRequest;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialUEMessage_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_UEContextRequest;
-  ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_UEContextRequest;
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.choice.UEContextRequest = NGAP_UEContextRequest_requested;
+    ie->value.present = NGAP_InitialUEMessage_IEs__value_PR_UEContextRequest;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.UEContextRequest = NGAP_UEContextRequest_requested;
+  }
  if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
      /* Failed to encode message */
@@ -342,9 +315,7 @@ int ngap_gNB_handle_nas_downlink(uint32_t         assoc_id,
  // }
  if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) {
-    NGAP_ERROR(
+    NGAP_ERROR("[SCTP %d] Received NAS downlink message for non existing AMF context\n", assoc_id);
-        "[SCTP %d] Received NAS downlink message for non existing AMF context\n",
-        assoc_id);
    return -1;
  }
@@ -360,8 +331,7 @@ int ngap_gNB_handle_nas_downlink(uint32_t         assoc_id,
                             NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID, true);
  gnb_ue_ngap_id = ie->value.choice.RAN_UE_NGAP_ID;
-  if ((ue_desc_p = ngap_gNB_get_ue_context(ngap_gNB_instance,
+  if ((ue_desc_p = ngap_get_ue_context(gnb_ue_ngap_id)) == NULL) {
-                   gnb_ue_ngap_id)) == NULL) {
    NGAP_ERROR("[SCTP %d] Received NAS downlink message for non existing UE context gNB_UE_NGAP_ID: 0x%lx\n",
               assoc_id,
               gnb_ue_ngap_id);
@@ -384,23 +354,15 @@ int ngap_gNB_handle_nas_downlink(uint32_t         assoc_id,
  } else {
    /* We already have a amf ue ngap id check the received is the same */
    if (ue_desc_p->amf_ue_ngap_id != amf_ue_ngap_id) {
-        NGAP_ERROR("[SCTP %d] Mismatch in AMF UE NGAP ID (0x%lx != 0x%"PRIx64"\n",
+      NGAP_ERROR("[SCTP %d] Mismatch in AMF UE NGAP ID (0x%lx != 0x%" PRIx64 "\n", assoc_id, amf_ue_ngap_id, (uint64_t)ue_desc_p->amf_ue_ngap_id);
-                   assoc_id,
+      return -1;
-                   amf_ue_ngap_id,
-                   (uint64_t)ue_desc_p->amf_ue_ngap_id
-                  );
-        return -1;
    }
  }
  NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_DownlinkNASTransport_IEs_t, ie, container,
                             NGAP_ProtocolIE_ID_id_NAS_PDU, true);
  /* Forward the NAS PDU to NR-RRC */
-  ngap_gNB_itti_send_nas_downlink_ind(ngap_gNB_instance->instance,
+  ngap_gNB_itti_send_nas_downlink_ind(ngap_gNB_instance->instance, ue_desc_p->gNB_ue_ngap_id, ie->value.choice.NAS_PDU.buf, ie->value.choice.NAS_PDU.size);
-                                      ue_desc_p->ue_initial_id,
-                                      ue_desc_p->gNB_ue_ngap_id,
-                                      ie->value.choice.NAS_PDU.buf,
-                                      ie->value.choice.NAS_PDU.size);
  return 0;
 }
@@ -411,10 +373,7 @@ int ngap_gNB_nas_uplink(instance_t instance, ngap_uplink_nas_t *ngap_uplink_nas_
 {
  struct ngap_gNB_ue_context_s  *ue_context_p;
  ngap_gNB_instance_t           *ngap_gNB_instance_p;
-  NGAP_NGAP_PDU_t                pdu;
+  NGAP_NGAP_PDU_t pdu;
-  NGAP_UplinkNASTransport_t     *out;
-  NGAP_UplinkNASTransport_IEs_t *ie;
-  NGAP_UserLocationInformationNR_t *userinfo_nr_p = NULL;
  uint8_t  *buffer;
  uint32_t  length;
  DevAssert(ngap_uplink_nas_p != NULL);
@@ -422,7 +381,7 @@ int ngap_gNB_nas_uplink(instance_t instance, ngap_uplink_nas_t *ngap_uplink_nas_
  ngap_gNB_instance_p = ngap_gNB_get_instance(instance);
  DevAssert(ngap_gNB_instance_p != NULL);
-  if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p, ngap_uplink_nas_p->gNB_ue_ngap_id)) == NULL) {
+  if ((ue_context_p = ngap_get_ue_context(ngap_uplink_nas_p->gNB_ue_ngap_id)) == NULL) {
    /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: %08x\n",
              ngap_uplink_nas_p->gNB_ue_ngap_id);
@@ -432,8 +391,7 @@ int ngap_gNB_nas_uplink(instance_t instance, ngap_uplink_nas_t *ngap_uplink_nas_
  /* Uplink NAS transport can occur either during an ngap connected state
   * or during initial attach (for example: NAS authentication).
   */
-  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED ||
+  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED || ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
-          ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
    NGAP_WARN("You are attempting to send NAS data over non-connected "
              "gNB ue ngap id: %u, current state: %d\n",
              ngap_uplink_nas_p->gNB_ue_ngap_id, ue_context_p->ue_state);
@@ -443,63 +401,63 @@ int ngap_gNB_nas_uplink(instance_t instance, ngap_uplink_nas_t *ngap_uplink_nas_
  /* Prepare the NGAP message to encode */
  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage;
-  pdu.choice.initiatingMessage = (NGAP_InitiatingMessage_t *)calloc(1,sizeof(NGAP_InitiatingMessage_t));
+  asn1cCalloc(pdu.choice.initiatingMessage, head);
-  pdu.choice.initiatingMessage->procedureCode = NGAP_ProcedureCode_id_UplinkNASTransport;
+  head->procedureCode = NGAP_ProcedureCode_id_UplinkNASTransport;
-  pdu.choice.initiatingMessage->criticality = NGAP_Criticality_ignore;
+  head->criticality = NGAP_Criticality_ignore;
-  pdu.choice.initiatingMessage->value.present = NGAP_InitiatingMessage__value_PR_UplinkNASTransport;
+  head->value.present = NGAP_InitiatingMessage__value_PR_UplinkNASTransport;
-  out = &pdu.choice.initiatingMessage->value.choice.UplinkNASTransport;
+  NGAP_UplinkNASTransport_t *out = &head->value.choice.UplinkNASTransport;
  /* mandatory */
-  ie = (NGAP_UplinkNASTransport_IEs_t *)calloc(1, sizeof(NGAP_UplinkNASTransport_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UplinkNASTransport_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
-  ie->value.present = NGAP_UplinkNASTransport_IEs__value_PR_AMF_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
-  //ie->value.choice.AMF_UE_NGAP_ID = ue_context_p->amf_ue_ngap_id;
+    ie->value.present = NGAP_UplinkNASTransport_IEs__value_PR_AMF_UE_NGAP_ID;
-  asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    // ie->value.choice.AMF_UE_NGAP_ID = ue_context_p->amf_ue_ngap_id;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+  }
  /* mandatory */
-  ie = (NGAP_UplinkNASTransport_IEs_t *)calloc(1, sizeof(NGAP_UplinkNASTransport_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UplinkNASTransport_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_UplinkNASTransport_IEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
-  ie->value.choice.RAN_UE_NGAP_ID = ue_context_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_UplinkNASTransport_IEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = ue_context_p->gNB_ue_ngap_id;
+  }
  /* mandatory */
-  ie = (NGAP_UplinkNASTransport_IEs_t *)calloc(1, sizeof(NGAP_UplinkNASTransport_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_NAS_PDU;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UplinkNASTransport_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_NAS_PDU;
-  ie->value.present = NGAP_UplinkNASTransport_IEs__value_PR_NAS_PDU;
+    ie->criticality = NGAP_Criticality_reject;
-  ie->value.choice.NAS_PDU.buf = ngap_uplink_nas_p->nas_pdu.buffer;
+    ie->value.present = NGAP_UplinkNASTransport_IEs__value_PR_NAS_PDU;
-  ie->value.choice.NAS_PDU.size = ngap_uplink_nas_p->nas_pdu.length;
+    ie->value.choice.NAS_PDU.buf = ngap_uplink_nas_p->nas_pdu.buffer;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.NAS_PDU.size = ngap_uplink_nas_p->nas_pdu.length;
+  }
  /* mandatory */
-  ie = (NGAP_UplinkNASTransport_IEs_t *)calloc(1, sizeof(NGAP_UplinkNASTransport_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_UserLocationInformation;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UplinkNASTransport_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_UserLocationInformation;
-  ie->value.present = NGAP_UplinkNASTransport_IEs__value_PR_UserLocationInformation;
+    ie->criticality = NGAP_Criticality_ignore;
+    ie->value.present = NGAP_UplinkNASTransport_IEs__value_PR_UserLocationInformation;
-  ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
-  ie->value.choice.UserLocationInformation.choice.userLocationInformationNR = CALLOC(1,sizeof(struct NGAP_UserLocationInformationNR));
-  userinfo_nr_p = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR;
-  /* Set nRCellIdentity. default userLocationInformationNR */
-  MACRO_GNB_ID_TO_CELL_IDENTITY(ngap_gNB_instance_p->gNB_id,
-                                    0, // Cell ID
-                                    &userinfo_nr_p->nR_CGI.nRCellIdentity);
-  MCC_MNC_TO_TBCD(ngap_gNB_instance_p->mcc[ue_context_p->selected_plmn_identity],
-                  ngap_gNB_instance_p->mnc[ue_context_p->selected_plmn_identity],
-                  ngap_gNB_instance_p->mnc_digit_length[ue_context_p->selected_plmn_identity],
-                  &userinfo_nr_p->nR_CGI.pLMNIdentity);
-  /* Set TAI */
-  INT24_TO_OCTET_STRING(ngap_gNB_instance_p->tac, &userinfo_nr_p->tAI.tAC);
-  MCC_MNC_TO_PLMNID(ngap_gNB_instance_p->mcc[ue_context_p->selected_plmn_identity],
-                    ngap_gNB_instance_p->mnc[ue_context_p->selected_plmn_identity],
-                    ngap_gNB_instance_p->mnc_digit_length[ue_context_p->selected_plmn_identity],
-                    &userinfo_nr_p->tAI.pLMNIdentity);
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
+    asn1cCalloc(ie->value.choice.UserLocationInformation.choice.userLocationInformationNR, userinfo_nr_p);
+    /* Set nRCellIdentity. default userLocationInformationNR */
+    MACRO_GNB_ID_TO_CELL_IDENTITY(ngap_gNB_instance_p->gNB_id,
+                                  0, // Cell ID
+                                  &userinfo_nr_p->nR_CGI.nRCellIdentity);
+    MCC_MNC_TO_TBCD(ngap_gNB_instance_p->mcc[ue_context_p->selected_plmn_identity],
+                    ngap_gNB_instance_p->mnc[ue_context_p->selected_plmn_identity],
+                    ngap_gNB_instance_p->mnc_digit_length[ue_context_p->selected_plmn_identity],
+                    &userinfo_nr_p->nR_CGI.pLMNIdentity);
+    /* Set TAI */
+    INT24_TO_OCTET_STRING(ngap_gNB_instance_p->tac, &userinfo_nr_p->tAI.tAC);
+    MCC_MNC_TO_PLMNID(ngap_gNB_instance_p->mcc[ue_context_p->selected_plmn_identity],
+                      ngap_gNB_instance_p->mnc[ue_context_p->selected_plmn_identity],
+                      ngap_gNB_instance_p->mnc_digit_length[ue_context_p->selected_plmn_identity],
+                      &userinfo_nr_p->tAI.pLMNIdentity);
+  }
  if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
    NGAP_ERROR("Failed to encode uplink NAS transport\n");
    /* Encode procedure has failed... */
@@ -522,9 +480,7 @@ int ngap_gNB_nas_non_delivery_ind(instance_t instance,
 {
  struct ngap_gNB_ue_context_s        *ue_context_p;
  ngap_gNB_instance_t                 *ngap_gNB_instance_p;
-  NGAP_NGAP_PDU_t                      pdu;
+  NGAP_NGAP_PDU_t pdu;
-  NGAP_NASNonDeliveryIndication_t     *out;
-  NGAP_NASNonDeliveryIndication_IEs_t *ie;
  uint8_t  *buffer;
  uint32_t  length;
  DevAssert(ngap_nas_non_delivery_ind != NULL);
@@ -532,7 +488,7 @@ int ngap_gNB_nas_non_delivery_ind(instance_t instance,
  ngap_gNB_instance_p = ngap_gNB_get_instance(instance);
  DevAssert(ngap_gNB_instance_p != NULL);
-  if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p, ngap_nas_non_delivery_ind->gNB_ue_ngap_id)) == NULL) {
+  if ((ue_context_p = ngap_get_ue_context(ngap_nas_non_delivery_ind->gNB_ue_ngap_id)) == NULL) {
    /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: %08x\n",
              ngap_nas_non_delivery_ind->gNB_ue_ngap_id);
@@ -542,42 +498,46 @@ int ngap_gNB_nas_non_delivery_ind(instance_t instance,
  /* Prepare the NGAP message to encode */
  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage;
-  pdu.choice.initiatingMessage = (NGAP_InitiatingMessage_t *)calloc(1,sizeof(NGAP_InitiatingMessage_t));
+  asn1cCalloc(pdu.choice.initiatingMessage, head);
-  pdu.choice.initiatingMessage->procedureCode = NGAP_ProcedureCode_id_NASNonDeliveryIndication;
+  head->procedureCode = NGAP_ProcedureCode_id_NASNonDeliveryIndication;
-  pdu.choice.initiatingMessage->criticality = NGAP_Criticality_ignore;
+  head->criticality = NGAP_Criticality_ignore;
-  pdu.choice.initiatingMessage->value.present = NGAP_InitiatingMessage__value_PR_NASNonDeliveryIndication;
+  head->value.present = NGAP_InitiatingMessage__value_PR_NASNonDeliveryIndication;
-  out = &pdu.choice.initiatingMessage->value.choice.NASNonDeliveryIndication;
+  NGAP_NASNonDeliveryIndication_t *out = &head->value.choice.NASNonDeliveryIndication;
  /* mandatory */
-  ie = (NGAP_NASNonDeliveryIndication_IEs_t *)calloc(1, sizeof(NGAP_NASNonDeliveryIndication_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_NASNonDeliveryIndication_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
-  ie->value.present = NGAP_NASNonDeliveryIndication_IEs__value_PR_AMF_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
-  asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    ie->value.present = NGAP_NASNonDeliveryIndication_IEs__value_PR_AMF_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+  }
  /* mandatory */
-  ie = (NGAP_NASNonDeliveryIndication_IEs_t *)calloc(1, sizeof(NGAP_NASNonDeliveryIndication_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_NASNonDeliveryIndication_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_NASNonDeliveryIndication_IEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
-  ie->value.choice.RAN_UE_NGAP_ID = ue_context_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_NASNonDeliveryIndication_IEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = ue_context_p->gNB_ue_ngap_id;
+  }
  /* mandatory */
-  ie = (NGAP_NASNonDeliveryIndication_IEs_t *)calloc(1, sizeof(NGAP_NASNonDeliveryIndication_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_NAS_PDU;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_NASNonDeliveryIndication_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_NAS_PDU;
-  ie->value.present = NGAP_NASNonDeliveryIndication_IEs__value_PR_NAS_PDU;
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.choice.NAS_PDU.buf = ngap_nas_non_delivery_ind->nas_pdu.buffer;
+    ie->value.present = NGAP_NASNonDeliveryIndication_IEs__value_PR_NAS_PDU;
-  ie->value.choice.NAS_PDU.size = ngap_nas_non_delivery_ind->nas_pdu.length;
+    ie->value.choice.NAS_PDU.buf = ngap_nas_non_delivery_ind->nas_pdu.buffer;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.NAS_PDU.size = ngap_nas_non_delivery_ind->nas_pdu.length;
+  }
  /* mandatory */
-  ie = (NGAP_NASNonDeliveryIndication_IEs_t *)calloc(1, sizeof(NGAP_NASNonDeliveryIndication_IEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_Cause;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_NASNonDeliveryIndication_IEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_Cause;
-  /* Send a dummy cause */
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.present = NGAP_NASNonDeliveryIndication_IEs__value_PR_Cause;
+    /* Send a dummy cause */
-  ie->value.choice.Cause.present = NGAP_Cause_PR_radioNetwork;
+    ie->value.present = NGAP_NASNonDeliveryIndication_IEs__value_PR_Cause;
-  ie->value.choice.Cause.choice.radioNetwork = NGAP_CauseRadioNetwork_radio_connection_with_ue_lost;
+    ie->value.choice.Cause.present = NGAP_Cause_PR_radioNetwork;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.Cause.choice.radioNetwork = NGAP_CauseRadioNetwork_radio_connection_with_ue_lost;
+  }
  if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
    NGAP_ERROR("Failed to encode NAS NON delivery indication\n");
@@ -594,30 +554,23 @@ int ngap_gNB_nas_non_delivery_ind(instance_t instance,
 }
 //------------------------------------------------------------------------------
-int ngap_gNB_initial_ctxt_resp(
+int ngap_gNB_initial_ctxt_resp(instance_t instance, ngap_initial_context_setup_resp_t *initial_ctxt_resp_p)
-    instance_t instance, ngap_initial_context_setup_resp_t *initial_ctxt_resp_p)
 //------------------------------------------------------------------------------
 {
  ngap_gNB_instance_t                   *ngap_gNB_instance_p = NULL;
  struct ngap_gNB_ue_context_s          *ue_context_p        = NULL;
-  NGAP_NGAP_PDU_t                        pdu;
+  NGAP_NGAP_PDU_t pdu;
-  NGAP_InitialContextSetupResponse_t    *out;
+  uint8_t *buffer = NULL;
-  NGAP_InitialContextSetupResponseIEs_t *ie;
-  uint8_t  *buffer = NULL;
-  uint8_t pdusessionTransfer_buffer[1000];
  uint32_t length;
-  int      i;
+  int i;
-  asn_encode_to_new_buffer_result_t res = { NULL, {0, NULL, NULL} };
  /* Retrieve the NGAP gNB instance associated with Mod_id */
  ngap_gNB_instance_p = ngap_gNB_get_instance(instance);
  DevAssert(initial_ctxt_resp_p != NULL);
  DevAssert(ngap_gNB_instance_p != NULL);
-  if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p,
+  if ((ue_context_p = ngap_get_ue_context(initial_ctxt_resp_p->gNB_ue_ngap_id)) == NULL) {
-                      initial_ctxt_resp_p->gNB_ue_ngap_id)) == NULL) {
    /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: 0x%08x\n",
              initial_ctxt_resp_p->gNB_ue_ngap_id);
@@ -627,8 +580,7 @@ int ngap_gNB_initial_ctxt_resp(
  /* Uplink NAS transport can occur either during an ngap connected state
   * or during initial attach (for example: NAS authentication).
   */
-  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED ||
+  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED || ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
-          ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
    NGAP_WARN("You are attempting to send NAS data over non-connected "
              "gNB ue ngap id: %08x, current state: %d\n",
              initial_ctxt_resp_p->gNB_ue_ngap_id, ue_context_p->ue_state);
@@ -638,169 +590,132 @@ int ngap_gNB_initial_ctxt_resp(
  /* Prepare the NGAP message to encode */
  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_successfulOutcome;
-  pdu.choice.successfulOutcome = (NGAP_SuccessfulOutcome_t *)calloc(1,sizeof(struct NGAP_SuccessfulOutcome));
+  asn1cCalloc(pdu.choice.successfulOutcome, head);
-  pdu.choice.successfulOutcome->procedureCode = NGAP_ProcedureCode_id_InitialContextSetup;
+  head->procedureCode = NGAP_ProcedureCode_id_InitialContextSetup;
-  pdu.choice.successfulOutcome->criticality = NGAP_Criticality_reject;
+  head->criticality = NGAP_Criticality_reject;
-  pdu.choice.successfulOutcome->value.present = NGAP_SuccessfulOutcome__value_PR_InitialContextSetupResponse;
+  head->value.present = NGAP_SuccessfulOutcome__value_PR_InitialContextSetupResponse;
-  out = &pdu.choice.successfulOutcome->value.choice.InitialContextSetupResponse;
+  NGAP_InitialContextSetupResponse_t *out = &head->value.choice.InitialContextSetupResponse;
  /* mandatory */
-  ie = (NGAP_InitialContextSetupResponseIEs_t *)calloc(1, sizeof(NGAP_InitialContextSetupResponseIEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialContextSetupResponseIEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
-  ie->value.present = NGAP_InitialContextSetupResponseIEs__value_PR_AMF_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_ignore;
-  //ie->value.choice.AMF_UE_NGAP_ID = ue_context_p->amf_ue_ngap_id;
+    ie->value.present = NGAP_InitialContextSetupResponseIEs__value_PR_AMF_UE_NGAP_ID;
-  asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    // ie->value.choice.AMF_UE_NGAP_ID = ue_context_p->amf_ue_ngap_id;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+  }
  /* mandatory */
-  ie = (NGAP_InitialContextSetupResponseIEs_t *)calloc(1, sizeof(NGAP_InitialContextSetupResponseIEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialContextSetupResponseIEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_InitialContextSetupResponseIEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.choice.RAN_UE_NGAP_ID = initial_ctxt_resp_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_InitialContextSetupResponseIEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = initial_ctxt_resp_p->gNB_ue_ngap_id;
+  }
  /* optional */
  if (initial_ctxt_resp_p->nb_of_pdusessions){
-    ie = (NGAP_InitialContextSetupResponseIEs_t *)calloc(1, sizeof(NGAP_InitialContextSetupResponseIEs_t));
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialContextSetupResponseIEs_t, ie);
    ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListCxtRes;
    ie->criticality = NGAP_Criticality_ignore;
    ie->value.present = NGAP_InitialContextSetupResponseIEs__value_PR_PDUSessionResourceSetupListCxtRes;
    for (i = 0; i < initial_ctxt_resp_p->nb_of_pdusessions; i++) {
-      NGAP_PDUSessionResourceSetupItemCxtRes_t *item;
+      asn1cSequenceAdd(ie->value.choice.PDUSessionResourceSetupListCxtRes.list, NGAP_PDUSessionResourceSetupItemCxtRes_t, item);
-      NGAP_PDUSessionResourceSetupResponseTransfer_t     *pdusessionTransfer_p = NULL;
-      /* mandatory */
-      item = (NGAP_PDUSessionResourceSetupItemCxtRes_t *)calloc(1, sizeof(NGAP_PDUSessionResourceSetupItemCxtRes_t));
      /* pDUSessionID */
      item->pDUSessionID = initial_ctxt_resp_p->pdusessions[i].pdusession_id;
      /* dLQosFlowPerTNLInformation */
-      pdusessionTransfer_p = (NGAP_PDUSessionResourceSetupResponseTransfer_t *)calloc(1, sizeof(NGAP_PDUSessionResourceSetupResponseTransfer_t));
+      NGAP_PDUSessionResourceSetupResponseTransfer_t pdusessionTransfer = {0};
-      pdusessionTransfer_p->dLQosFlowPerTNLInformation.uPTransportLayerInformation.present = NGAP_UPTransportLayerInformation_PR_gTPTunnel;
+      pdusessionTransfer.dLQosFlowPerTNLInformation.uPTransportLayerInformation.present = NGAP_UPTransportLayerInformation_PR_gTPTunnel;
-      pdusessionTransfer_p->dLQosFlowPerTNLInformation.uPTransportLayerInformation.choice.gTPTunnel = (NGAP_GTPTunnel_t *)calloc(1, sizeof(NGAP_GTPTunnel_t));
-      struct NGAP_GTPTunnel *tmp=pdusessionTransfer_p->dLQosFlowPerTNLInformation.uPTransportLayerInformation.choice.gTPTunnel;
-      GTP_TEID_TO_ASN1(initial_ctxt_resp_p->pdusessions[i].gtp_teid, &tmp->gTP_TEID);
-      tmp->transportLayerAddress.buf = malloc(initial_ctxt_resp_p->pdusessions[i].gNB_addr.length);
-      memcpy(tmp->transportLayerAddress.buf,
+      asn1cCalloc(pdusessionTransfer.dLQosFlowPerTNLInformation.uPTransportLayerInformation.choice.gTPTunnel, tmp);
-             initial_ctxt_resp_p->pdusessions[i].gNB_addr.buffer,
+      GTP_TEID_TO_ASN1(initial_ctxt_resp_p->pdusessions[i].gtp_teid, &tmp->gTP_TEID);
-             initial_ctxt_resp_p->pdusessions[i].gNB_addr.length);
+      allocAddrCopy(&tmp->transportLayerAddress, initial_ctxt_resp_p->pdusessions[i].gNB_addr);
-      tmp->transportLayerAddress.size = initial_ctxt_resp_p->pdusessions[i].gNB_addr.length;
-      tmp->transportLayerAddress.bits_unused = 0;
-      NGAP_DEBUG("initial_ctxt_resp_p: pdusession ID %ld\n",
+      NGAP_DEBUG("initial_ctxt_resp_p: pdusession ID %ld\n", item->pDUSessionID);
-                 item->pDUSessionID);
      /* associatedQosFlowList. number of 1? */
      for(int j=0; j < initial_ctxt_resp_p->pdusessions[i].nb_of_qos_flow; j++) {
-        NGAP_AssociatedQosFlowItem_t *ass_qos_item_p;
+        asn1cSequenceAdd(pdusessionTransfer.dLQosFlowPerTNLInformation.associatedQosFlowList.list, NGAP_AssociatedQosFlowItem_t, ass_qos_item_p);
-        ass_qos_item_p = (NGAP_AssociatedQosFlowItem_t *)calloc(1, sizeof(NGAP_AssociatedQosFlowItem_t));
        /* qosFlowIdentifier */
        ass_qos_item_p->qosFlowIdentifier = initial_ctxt_resp_p->pdusessions[i].associated_qos_flows[j].qfi;
        /* qosFlowMappingIndication */
-        //if(initial_ctxt_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind != QOSFLOW_MAPPING_INDICATION_NON) {
+        // if(initial_ctxt_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind != QOSFLOW_MAPPING_INDICATION_NON) {
-        //  ass_qos_item_p->qosFlowMappingIndication = malloc(sizeof(*ass_qos_item_p->qosFlowMappingIndication));
+        //   ass_qos_item_p->qosFlowMappingIndication = malloc(sizeof(*ass_qos_item_p->qosFlowMappingIndication));
-        //  *ass_qos_item_p->qosFlowMappingIndication = initial_ctxt_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind;
+        //   *ass_qos_item_p->qosFlowMappingIndication = initial_ctxt_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind;
-        // }
+        //  }
-        asn1cSeqAdd(&pdusessionTransfer_p->dLQosFlowPerTNLInformation.associatedQosFlowList.list, ass_qos_item_p);
      }
-      //res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p);
-      //item->pDUSessionResourceSetupResponseTransfer.buf = res.buffer;
-      //item->pDUSessionResourceSetupResponseTransfer.size = res.result.encoded;
-      if (asn1_xer_print) {
+      void *pdusessionTransfer_buffer;
-        xer_fprint(stdout, &asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p);
+      ssize_t encoded = aper_encode_to_new_buffer(&asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, NULL, &pdusessionTransfer, &pdusessionTransfer_buffer);
-      }
+      AssertFatal(encoded > 0, "ASN1 message encoding failed !\n");
+      item->pDUSessionResourceSetupResponseTransfer.buf = pdusessionTransfer_buffer;
+      item->pDUSessionResourceSetupResponseTransfer.size = encoded;
-      memset(pdusessionTransfer_buffer, 0, 1000);
+      ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, &pdusessionTransfer);
-      asn_enc_rval_t  enc_rval = aper_encode_to_buffer(&asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, 
-          NULL, 
-          pdusessionTransfer_p, 
-          pdusessionTransfer_buffer,1000);
-      AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n", enc_rval.failed_type->name, enc_rval.encoded);
-      item->pDUSessionResourceSetupResponseTransfer.buf = pdusessionTransfer_buffer; 
-      item->pDUSessionResourceSetupResponseTransfer.size = enc_rval.encoded;
-      ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p);
-      asn1cSeqAdd(&ie->value.choice.PDUSessionResourceSetupListCxtRes.list, item);
    }
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
  /* optional */
  if (initial_ctxt_resp_p->nb_of_pdusessions_failed) {
-    ie = (NGAP_InitialContextSetupResponseIEs_t *)calloc(1, sizeof(NGAP_InitialContextSetupResponseIEs_t));
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialContextSetupResponseIEs_t, ie);
    ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceFailedToSetupListCxtRes;
    ie->criticality = NGAP_Criticality_ignore;
    ie->value.present = NGAP_InitialContextSetupResponseIEs__value_PR_PDUSessionResourceFailedToSetupListCxtRes;
    for (i = 0; i < initial_ctxt_resp_p->nb_of_pdusessions_failed; i++) {
-        NGAP_PDUSessionResourceFailedToSetupItemCxtRes_t *item= calloc(1, sizeof *item);
+      asn1cSequenceAdd(ie->value.choice.PDUSessionResourceFailedToSetupListCxtRes.list, NGAP_PDUSessionResourceFailedToSetupItemCxtRes_t, item);
-        NGAP_PDUSessionResourceSetupUnsuccessfulTransfer_t *pdusessionUnTransfer_p = calloc(1, sizeof *pdusessionUnTransfer_p);
+      NGAP_PDUSessionResourceSetupUnsuccessfulTransfer_t pdusessionUnTransfer = {0};
-        /* pDUSessionID */
-        item->pDUSessionID = initial_ctxt_resp_p->pdusessions_failed[i].pdusession_id;
-        /* cause */
-        pdusessionUnTransfer_p->cause.present = initial_ctxt_resp_p->pdusessions_failed[i].cause;
-        switch(pdusessionUnTransfer_p->cause.present) {
-          case NGAP_Cause_PR_radioNetwork:
-              pdusessionUnTransfer_p->cause.choice.radioNetwork = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
-              break;
-          case NGAP_Cause_PR_transport:
-              pdusessionUnTransfer_p->cause.choice.transport = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
-              break;
-          case NGAP_Cause_PR_nas:
-              pdusessionUnTransfer_p->cause.choice.nas = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
-              break;
-          case NGAP_Cause_PR_protocol:
-              pdusessionUnTransfer_p->cause.choice.protocol = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
-              break;
-          case NGAP_Cause_PR_misc:
-              pdusessionUnTransfer_p->cause.choice.misc = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
-              break;
-          case NGAP_Cause_PR_NOTHING:
-          default:
-              break;
-        }
-        NGAP_DEBUG("initial context setup response: failed pdusession ID %ld\n", item->pDUSessionID);
-        memset(&res, 0, sizeof(res));
-        res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer, pdusessionUnTransfer_p);
-        item->pDUSessionResourceSetupUnsuccessfulTransfer.buf = res.buffer;
-        item->pDUSessionResourceSetupUnsuccessfulTransfer.size = res.result.encoded;
-        ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer, pdusessionUnTransfer_p);
-        asn1cSeqAdd(&ie->value.choice.PDUSessionResourceFailedToSetupListCxtRes.list, item);
-    }
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
+      /* pDUSessionID */
+      item->pDUSessionID = initial_ctxt_resp_p->pdusessions_failed[i].pdusession_id;
+      /* cause */
+      pdusessionUnTransfer.cause.present = initial_ctxt_resp_p->pdusessions_failed[i].cause;
+      switch (pdusessionUnTransfer.cause.present) {
+        case NGAP_Cause_PR_radioNetwork:
+          pdusessionUnTransfer.cause.choice.radioNetwork = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
+          break;
+        case NGAP_Cause_PR_transport:
+          pdusessionUnTransfer.cause.choice.transport = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
+          break;
+        case NGAP_Cause_PR_nas:
+          pdusessionUnTransfer.cause.choice.nas = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
+          break;
+        case NGAP_Cause_PR_protocol:
+          pdusessionUnTransfer.cause.choice.protocol = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
+          break;
+        case NGAP_Cause_PR_misc:
+          pdusessionUnTransfer.cause.choice.misc = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
+          break;
+        case NGAP_Cause_PR_NOTHING:
+        default:
+          break;
+      }
+      NGAP_DEBUG("initial context setup response: failed pdusession ID %ld\n", item->pDUSessionID);
+      asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer, &pdusessionUnTransfer);
+      AssertFatal(res.buffer, "ASN1 message encoding failed (%s, %lu)!\n", res.result.failed_type->name, res.result.encoded);
+      item->pDUSessionResourceSetupUnsuccessfulTransfer.buf = res.buffer;
+      item->pDUSessionResourceSetupUnsuccessfulTransfer.size = res.result.encoded;
+      ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer, &pdusessionUnTransfer);
+    }
  }
  /* optional */
  if (0) {
-    ie = (NGAP_InitialContextSetupResponseIEs_t *)calloc(1, sizeof(NGAP_InitialContextSetupResponseIEs_t));
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_InitialContextSetupResponseIEs_t, ie);
    ie->id = NGAP_ProtocolIE_ID_id_CriticalityDiagnostics;
    ie->criticality = NGAP_Criticality_ignore;
    ie->value.present = NGAP_InitialContextSetupResponseIEs__value_PR_CriticalityDiagnostics;
    // ie->value.choice.CriticalityDiagnostics =;
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
  if (asn1_xer_print) {
@@ -815,23 +730,18 @@ int ngap_gNB_initial_ctxt_resp(
    /* UE associated signalling -> use the allocated stream */
    LOG_I(NR_RRC,"Send message to sctp: NGAP_InitialContextSetupResponse\n");
-    ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
+    ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance, ue_context_p->amf_ref->assoc_id, buffer, length, ue_context_p->tx_stream);
-                                     ue_context_p->amf_ref->assoc_id, buffer,
-                                     length, ue_context_p->tx_stream);
    return 0;
 }
 //------------------------------------------------------------------------------
-int ngap_gNB_ue_capabilities(instance_t instance,
+int ngap_gNB_ue_capabilities(instance_t instance, ngap_ue_cap_info_ind_t *ue_cap_info_ind_p)
-                             ngap_ue_cap_info_ind_t *ue_cap_info_ind_p)
 //------------------------------------------------------------------------------
 {
  ngap_gNB_instance_t          *ngap_gNB_instance_p;
  struct ngap_gNB_ue_context_s *ue_context_p;
-  NGAP_NGAP_PDU_t                       pdu;
+  NGAP_NGAP_PDU_t pdu;
-  NGAP_UERadioCapabilityInfoIndication_t    *out;
-  NGAP_UERadioCapabilityInfoIndicationIEs_t *ie;
  uint8_t  *buffer;
  uint32_t length;
  /* Retrieve the NGAP gNB instance associated with Mod_id */
@@ -839,56 +749,57 @@ int ngap_gNB_ue_capabilities(instance_t instance,
  DevAssert(ue_cap_info_ind_p != NULL);
  DevAssert(ngap_gNB_instance_p != NULL);
-  if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p,
+  if ((ue_context_p = ngap_get_ue_context(ue_cap_info_ind_p->gNB_ue_ngap_id)) == NULL) {
-                      ue_cap_info_ind_p->gNB_ue_ngap_id)) == NULL) {
    /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
-    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: %u\n",
+    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: %u\n", ue_cap_info_ind_p->gNB_ue_ngap_id);
-              ue_cap_info_ind_p->gNB_ue_ngap_id);
    return -1;
  }
  /* UE radio capabilities message can occur either during an ngap connected state
   * or during initial attach (for example: NAS authentication).
   */
-  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED ||
+  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED || ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
-          ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
+    NGAP_WARN(
-    NGAP_WARN("You are attempting to send NAS data over non-connected "
+        "You are attempting to send NAS data over non-connected "
-              "gNB ue ngap id: %u, current state: %d\n",
+        "gNB ue ngap id: %u, current state: %d\n",
-              ue_cap_info_ind_p->gNB_ue_ngap_id, ue_context_p->ue_state);
+        ue_cap_info_ind_p->gNB_ue_ngap_id,
+        ue_context_p->ue_state);
    return -1;
  }
  /* Prepare the NGAP message to encode */
  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage;
-  pdu.choice.initiatingMessage = (NGAP_InitiatingMessage_t *)calloc(1,sizeof(NGAP_InitiatingMessage_t));
+  asn1cCalloc(pdu.choice.initiatingMessage, head);
-  pdu.choice.initiatingMessage->procedureCode = NGAP_ProcedureCode_id_UERadioCapabilityInfoIndication;
+  head->procedureCode = NGAP_ProcedureCode_id_UERadioCapabilityInfoIndication;
-  pdu.choice.initiatingMessage->criticality = NGAP_Criticality_ignore;
+  head->criticality = NGAP_Criticality_ignore;
-  pdu.choice.initiatingMessage->value.present = NGAP_InitiatingMessage__value_PR_UERadioCapabilityInfoIndication;
+  head->value.present = NGAP_InitiatingMessage__value_PR_UERadioCapabilityInfoIndication;
-  out = &pdu.choice.initiatingMessage->value.choice.UERadioCapabilityInfoIndication;
+  NGAP_UERadioCapabilityInfoIndication_t *out = &head->value.choice.UERadioCapabilityInfoIndication;
  /* mandatory */
-  ie = (NGAP_UERadioCapabilityInfoIndicationIEs_t *)calloc(1, sizeof(NGAP_UERadioCapabilityInfoIndicationIEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UERadioCapabilityInfoIndicationIEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
-  ie->value.present = NGAP_UERadioCapabilityInfoIndicationIEs__value_PR_AMF_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
-  //ie->value.choice.AMF_UE_NGAP_ID = ue_context_p->amf_ue_ngap_id;
+    ie->value.present = NGAP_UERadioCapabilityInfoIndicationIEs__value_PR_AMF_UE_NGAP_ID;
-  asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    // ie->value.choice.AMF_UE_NGAP_ID = ue_context_p->amf_ue_ngap_id;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+  }
  /* mandatory */
-  ie = (NGAP_UERadioCapabilityInfoIndicationIEs_t *)calloc(1, sizeof(NGAP_UERadioCapabilityInfoIndicationIEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UERadioCapabilityInfoIndicationIEs_t, ie);
-  ie->criticality = NGAP_Criticality_reject;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_UERadioCapabilityInfoIndicationIEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
-  ie->value.choice.RAN_UE_NGAP_ID = ue_cap_info_ind_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_UERadioCapabilityInfoIndicationIEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = ue_cap_info_ind_p->gNB_ue_ngap_id;
+  }
  /* mandatory */
-  ie = (NGAP_UERadioCapabilityInfoIndicationIEs_t *)calloc(1, sizeof(NGAP_UERadioCapabilityInfoIndicationIEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_UERadioCapability;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_UERadioCapabilityInfoIndicationIEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_UERadioCapability;
-  ie->value.present = NGAP_UERadioCapabilityInfoIndicationIEs__value_PR_UERadioCapability;
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.choice.UERadioCapability.buf = ue_cap_info_ind_p->ue_radio_cap.buffer;
+    ie->value.present = NGAP_UERadioCapabilityInfoIndicationIEs__value_PR_UERadioCapability;
-  ie->value.choice.UERadioCapability.size = ue_cap_info_ind_p->ue_radio_cap.length;
+    ie->value.choice.UERadioCapability.buf = ue_cap_info_ind_p->ue_radio_cap.buffer;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.UERadioCapability.size = ue_cap_info_ind_p->ue_radio_cap.length;
+  }
  /* optional */
  //NGAP_UERadioCapabilityForPaging TBD
  if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
@@ -898,22 +809,17 @@ int ngap_gNB_ue_capabilities(instance_t instance,
  }
  /* UE associated signalling -> use the allocated stream */
-  ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
+  ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance, ue_context_p->amf_ref->assoc_id, buffer, length, ue_context_p->tx_stream);
-                                   ue_context_p->amf_ref->assoc_id, buffer,
-                                   length, ue_context_p->tx_stream);
  return 0;
 }
 //------------------------------------------------------------------------------
-int ngap_gNB_pdusession_setup_resp(instance_t instance,
+int ngap_gNB_pdusession_setup_resp(instance_t instance, ngap_pdusession_setup_resp_t *pdusession_setup_resp_p)
-                              ngap_pdusession_setup_resp_t *pdusession_setup_resp_p)
 //------------------------------------------------------------------------------
 {
  ngap_gNB_instance_t          *ngap_gNB_instance_p = NULL;
  struct ngap_gNB_ue_context_s *ue_context_p        = NULL;
-  NGAP_NGAP_PDU_t               pdu;
+  NGAP_NGAP_PDU_t pdu = {0};
-  NGAP_PDUSessionResourceSetupResponse_t    *out;
-  NGAP_PDUSessionResourceSetupResponseIEs_t *ie;
  uint8_t  *buffer  = NULL;
  uint32_t length;
@@ -922,152 +828,135 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance,
  DevAssert(pdusession_setup_resp_p != NULL);
  DevAssert(ngap_gNB_instance_p != NULL);
-  if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p,
+  if ((ue_context_p = ngap_get_ue_context(pdusession_setup_resp_p->gNB_ue_ngap_id)) == NULL) {
-                      pdusession_setup_resp_p->gNB_ue_ngap_id)) == NULL) {
    /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
-    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: 0x%08x\n",
+    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: 0x%08x\n", pdusession_setup_resp_p->gNB_ue_ngap_id);
-              pdusession_setup_resp_p->gNB_ue_ngap_id);
    return -1;
  }
  /* Uplink NAS transport can occur either during an ngap connected state
   * or during initial attach (for example: NAS authentication).
   */
-  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED ||
+  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED || ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
-          ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
+    NGAP_WARN(
-    NGAP_WARN("You are attempting to send NAS data over non-connected "
+        "You are attempting to send NAS data over non-connected "
-              "gNB ue ngap id: %08x, current state: %d\n",
+        "gNB ue ngap id: %08x, current state: %d\n",
-              pdusession_setup_resp_p->gNB_ue_ngap_id, ue_context_p->ue_state);
+        pdusession_setup_resp_p->gNB_ue_ngap_id,
+        ue_context_p->ue_state);
    return -1;
  }
  /* Prepare the NGAP message to encode */
-  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_successfulOutcome;
-  pdu.choice.successfulOutcome = calloc(1,sizeof *pdu.choice.successfulOutcome);
+  asn1cCalloc(pdu.choice.successfulOutcome, successfulOutcome);
-  pdu.choice.successfulOutcome->procedureCode = NGAP_ProcedureCode_id_PDUSessionResourceSetup;
+  successfulOutcome->procedureCode = NGAP_ProcedureCode_id_PDUSessionResourceSetup;
-  pdu.choice.successfulOutcome->criticality = NGAP_Criticality_reject;
+  successfulOutcome->criticality = NGAP_Criticality_reject;
-  pdu.choice.successfulOutcome->value.present = NGAP_SuccessfulOutcome__value_PR_PDUSessionResourceSetupResponse;
+  successfulOutcome->value.present = NGAP_SuccessfulOutcome__value_PR_PDUSessionResourceSetupResponse;
-  out = &pdu.choice.successfulOutcome->value.choice.PDUSessionResourceSetupResponse;
+  NGAP_PDUSessionResourceSetupResponse_t *out = &successfulOutcome->value.choice.PDUSessionResourceSetupResponse;
  /* mandatory */
-  ie = calloc(1, sizeof *ie);
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceSetupResponseIEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
-  ie->value.present = NGAP_PDUSessionResourceSetupResponseIEs__value_PR_AMF_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_ignore;
-  asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    ie->value.present = NGAP_PDUSessionResourceSetupResponseIEs__value_PR_AMF_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+  }
  /* mandatory */
-  ie = calloc(1, sizeof *ie );
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceSetupResponseIEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_PDUSessionResourceSetupResponseIEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.choice.RAN_UE_NGAP_ID = pdusession_setup_resp_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_PDUSessionResourceSetupResponseIEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = pdusession_setup_resp_p->gNB_ue_ngap_id;
+  }
  /* optional */
  if (pdusession_setup_resp_p->nb_of_pdusessions > 0) {
-    ie = calloc(1, sizeof *ie );
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceSetupResponseIEs_t, ie3);
-    ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListSURes;
+    ie3->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListSURes;
-    ie->criticality = NGAP_Criticality_ignore;
+    ie3->criticality = NGAP_Criticality_ignore;
-    ie->value.present = NGAP_PDUSessionResourceSetupResponseIEs__value_PR_PDUSessionResourceSetupListSURes;
+    ie3->value.present = NGAP_PDUSessionResourceSetupResponseIEs__value_PR_PDUSessionResourceSetupListSURes;
    for (int i = 0; i < pdusession_setup_resp_p->nb_of_pdusessions; i++) {
-      NGAP_PDUSessionResourceSetupItemSURes_t *item=calloc(1, sizeof *item );
+      pdusession_setup_t *pdusession = pdusession_setup_resp_p->pdusessions + i;
-      NGAP_PDUSessionResourceSetupResponseTransfer_t *pdusessionTransfer_p = calloc(1, sizeof *pdusessionTransfer_p );
+      asn1cSequenceAdd(ie3->value.choice.PDUSessionResourceSetupListSURes.list, NGAP_PDUSessionResourceSetupItemSURes_t, item);
      /* pDUSessionID */
-      item->pDUSessionID = pdusession_setup_resp_p->pdusessions[i].pdusession_id;
+      item->pDUSessionID = pdusession->pdusession_id;
      /* dLQosFlowPerTNLInformation */
+      NGAP_PDUSessionResourceSetupResponseTransfer_t pdusessionTransfer = {0};
-      pdusessionTransfer_p->dLQosFlowPerTNLInformation.uPTransportLayerInformation.present = NGAP_UPTransportLayerInformation_PR_gTPTunnel;
+      pdusessionTransfer.dLQosFlowPerTNLInformation.uPTransportLayerInformation.present = NGAP_UPTransportLayerInformation_PR_gTPTunnel;
-      pdusessionTransfer_p->dLQosFlowPerTNLInformation.uPTransportLayerInformation.choice.gTPTunnel =
+      asn1cCalloc(pdusessionTransfer.dLQosFlowPerTNLInformation.uPTransportLayerInformation.choice.gTPTunnel, tmp);
-                calloc(1, sizeof(struct NGAP_GTPTunnel));
+      GTP_TEID_TO_ASN1(pdusession->gtp_teid, &tmp->gTP_TEID);
-      struct NGAP_GTPTunnel *tmp=pdusessionTransfer_p->dLQosFlowPerTNLInformation.uPTransportLayerInformation.choice.gTPTunnel;
+      allocAddrCopy(&tmp->transportLayerAddress, pdusession->gNB_addr);
-      GTP_TEID_TO_ASN1(pdusession_setup_resp_p->pdusessions[i].gtp_teid, &tmp->gTP_TEID);
+      NGAP_DEBUG("pdusession_setup_resp_p: pdusession ID %ld, gnb_addr %d.%d.%d.%d, SIZE %ld \n",
-      if (pdusession_setup_resp_p->pdusessions[i].gNB_addr.length) {
+                 item->pDUSessionID,
-        tmp->transportLayerAddress.buf = malloc(pdusession_setup_resp_p->pdusessions[i].gNB_addr.length);
+                 tmp->transportLayerAddress.buf[0],
+                 tmp->transportLayerAddress.buf[1],
-        memcpy(tmp->transportLayerAddress.buf,
+                 tmp->transportLayerAddress.buf[2],
-               pdusession_setup_resp_p->pdusessions[i].gNB_addr.buffer,
+                 tmp->transportLayerAddress.buf[3],
-               pdusession_setup_resp_p->pdusessions[i].gNB_addr.length);
+                 tmp->transportLayerAddress.size);
-        tmp->transportLayerAddress.size = pdusession_setup_resp_p->pdusessions[i].gNB_addr.length;
-        tmp->transportLayerAddress.bits_unused = 0;
-        NGAP_DEBUG("pdusession_setup_resp_p: pdusession ID %ld, gnb_addr %d.%d.%d.%d, SIZE %ld \n",
-                   item->pDUSessionID,
-                   tmp->transportLayerAddress.buf[0],
-                   tmp->transportLayerAddress.buf[1],
-                   tmp->transportLayerAddress.buf[2],
-                   tmp->transportLayerAddress.buf[3],
-                   tmp->transportLayerAddress.size);
-      }
      /* associatedQosFlowList. number of 1? */
      for(int j=0; j < pdusession_setup_resp_p->pdusessions[i].nb_of_qos_flow; j++) {
-        NGAP_AssociatedQosFlowItem_t *ass_qos_item_p = calloc(1, sizeof *ass_qos_item_p);
+        asn1cSequenceAdd(pdusessionTransfer.dLQosFlowPerTNLInformation.associatedQosFlowList.list, NGAP_AssociatedQosFlowItem_t, ass_qos_item_p);
        /* qosFlowIdentifier */
        ass_qos_item_p->qosFlowIdentifier = pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qfi;
        /* qosFlowMappingIndication */
-        //if(pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind != QOSFLOW_MAPPING_INDICATION_NON) {
+        // if(pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind != QOSFLOW_MAPPING_INDICATION_NON) {
-        //  ass_qos_item_p->qosFlowMappingIndication = malloc(sizeof(*ass_qos_item_p->qosFlowMappingIndication));
+        //   ass_qos_item_p->qosFlowMappingIndication = malloc(sizeof(*ass_qos_item_p->qosFlowMappingIndication));
-        //  *ass_qos_item_p->qosFlowMappingIndication = pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind;
+        //   *ass_qos_item_p->qosFlowMappingIndication = pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind;
-        //}
+        // }
-        asn1cSeqAdd(&pdusessionTransfer_p->dLQosFlowPerTNLInformation.associatedQosFlowList.list, ass_qos_item_p);
      }
-      asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER,
+      asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, &pdusessionTransfer);
-								       &asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p);
      AssertFatal (res.buffer, "ASN1 message encoding failed (%s, %lu)!\n", res.result.failed_type->name, res.result.encoded);
      item->pDUSessionResourceSetupResponseTransfer.buf = res.buffer;
      item->pDUSessionResourceSetupResponseTransfer.size = res.result.encoded;
-      ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p);
+      ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, &pdusessionTransfer);
-      asn1cSeqAdd(&ie->value.choice.PDUSessionResourceSetupListSURes.list, item);
    }
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
  /* optional */
  if (pdusession_setup_resp_p->nb_of_pdusessions_failed > 0) {
-    ie = calloc(1, sizeof *ie);
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceSetupResponseIEs_t, ie);
    ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceFailedToSetupListSURes;
    ie->criticality = NGAP_Criticality_ignore;
    ie->value.present = NGAP_PDUSessionResourceSetupResponseIEs__value_PR_PDUSessionResourceFailedToSetupListSURes;
    for (int i = 0; i < pdusession_setup_resp_p->nb_of_pdusessions_failed; i++) {
      LOG_W(NGAP,"add a failed session\n");
-      NGAP_PDUSessionResourceFailedToSetupItemSURes_t *item=calloc(1, sizeof *item);
+      pdusession_failed_t *pdusession_failed = pdusession_setup_resp_p->pdusessions_failed + i;
-      NGAP_PDUSessionResourceSetupUnsuccessfulTransfer_t *pdusessionUnTransfer_p = calloc(1, sizeof *pdusessionUnTransfer_p);
+      asn1cSequenceAdd(ie->value.choice.PDUSessionResourceFailedToSetupListSURes.list, NGAP_PDUSessionResourceFailedToSetupItemSURes_t, item);
+      NGAP_PDUSessionResourceSetupUnsuccessfulTransfer_t pdusessionUnTransfer_p = {0};
      /* pDUSessionID */
-      item->pDUSessionID = pdusession_setup_resp_p->pdusessions_failed[i].pdusession_id;
+      item->pDUSessionID = pdusession_failed->pdusession_id;
      /* cause */
-      pdusessionUnTransfer_p->cause.present = pdusession_setup_resp_p->pdusessions_failed[i].cause;
+      pdusessionUnTransfer_p.cause.present = pdusession_failed->cause;
-      switch(pdusessionUnTransfer_p->cause.present) {
+      switch (pdusessionUnTransfer_p.cause.present) {
        case NGAP_Cause_PR_radioNetwork:
-            pdusessionUnTransfer_p->cause.choice.radioNetwork = pdusession_setup_resp_p->pdusessions_failed[i].cause_value;
+          pdusessionUnTransfer_p.cause.choice.radioNetwork = pdusession_failed->cause_value;
-            break;
+          break;
        case NGAP_Cause_PR_transport:
-            pdusessionUnTransfer_p->cause.choice.transport = pdusession_setup_resp_p->pdusessions_failed[i].cause_value;
+          pdusessionUnTransfer_p.cause.choice.transport = pdusession_failed->cause_value;
-            break;
+          break;
        case NGAP_Cause_PR_nas:
-            pdusessionUnTransfer_p->cause.choice.nas = pdusession_setup_resp_p->pdusessions_failed[i].cause_value;
+          pdusessionUnTransfer_p.cause.choice.nas = pdusession_failed->cause_value;
-            break;
+          break;
        case NGAP_Cause_PR_protocol:
-            pdusessionUnTransfer_p->cause.choice.protocol = pdusession_setup_resp_p->pdusessions_failed[i].cause_value;
+          pdusessionUnTransfer_p.cause.choice.protocol = pdusession_failed->cause_value;
-            break;
+          break;
        case NGAP_Cause_PR_misc:
-            pdusessionUnTransfer_p->cause.choice.misc = pdusession_setup_resp_p->pdusessions_failed[i].cause_value;
+          pdusessionUnTransfer_p.cause.choice.misc = pdusession_failed->cause_value;
-            break;
+          break;
        case NGAP_Cause_PR_NOTHING:
        default:
@@ -1076,31 +965,23 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance,
      NGAP_DEBUG("pdusession setup response: failed pdusession ID %ld\n", item->pDUSessionID);
-     asn_encode_to_new_buffer_result_t res =
+      asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer, &pdusessionUnTransfer_p);
-	       asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER,
-				  &asn_DEF_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer, pdusessionUnTransfer_p);     
      item->pDUSessionResourceSetupUnsuccessfulTransfer.buf = res.buffer;
      item->pDUSessionResourceSetupUnsuccessfulTransfer.size = res.result.encoded;
-      ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer, pdusessionUnTransfer_p);
+      ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer, &pdusessionUnTransfer_p);
-      asn1cSeqAdd(&ie->value.choice.PDUSessionResourceFailedToSetupListSURes.list, item);
    }
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
  /* optional */
  if (0) {
-    ie = calloc(1, sizeof *ie);
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceSetupResponseIEs_t, ie);
-      ie->id = NGAP_ProtocolIE_ID_id_CriticalityDiagnostics;
+    ie->id = NGAP_ProtocolIE_ID_id_CriticalityDiagnostics;
-      ie->criticality = NGAP_Criticality_ignore;
+    ie->criticality = NGAP_Criticality_ignore;
-      ie->value.present = NGAP_PDUSessionResourceSetupResponseIEs__value_PR_CriticalityDiagnostics;
+    ie->value.present = NGAP_PDUSessionResourceSetupResponseIEs__value_PR_CriticalityDiagnostics;
-      // ie->value.choice.CriticalityDiagnostics = ;
+    // ie->value.choice.CriticalityDiagnostics = ;
-      asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
  if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
      NGAP_ERROR("Failed to encode uplink transport\n");
      /* Encode procedure has failed... */
@@ -1108,100 +989,90 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance,
  }
  /* UE associated signalling -> use the allocated stream */
-  ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
+  ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance, ue_context_p->amf_ref->assoc_id, buffer, length, ue_context_p->tx_stream);
-                                   ue_context_p->amf_ref->assoc_id, buffer,
-                                   length, ue_context_p->tx_stream);
  return 0;
 }
 //------------------------------------------------------------------------------
-int ngap_gNB_pdusession_modify_resp(instance_t instance,
+int ngap_gNB_pdusession_modify_resp(instance_t instance, ngap_pdusession_modify_resp_t *pdusession_modify_resp_p)
-                               ngap_pdusession_modify_resp_t *pdusession_modify_resp_p)
 //------------------------------------------------------------------------------
 {
  ngap_gNB_instance_t                         *ngap_gNB_instance_p = NULL;
  struct ngap_gNB_ue_context_s                *ue_context_p        = NULL;
-  NGAP_NGAP_PDU_t                             pdu;
+  NGAP_NGAP_PDU_t pdu;
-  NGAP_PDUSessionResourceModifyResponse_t     *out;
-  NGAP_PDUSessionResourceModifyResponseIEs_t  *ie;
  uint8_t  *buffer  = NULL;
  uint32_t length;
-  int      i;
-  asn_encode_to_new_buffer_result_t res = { NULL, {0, NULL, NULL} };
  /* Retrieve the NGAP gNB instance associated with Mod_id */
  ngap_gNB_instance_p = ngap_gNB_get_instance(instance);
  DevAssert(pdusession_modify_resp_p != NULL);
  DevAssert(ngap_gNB_instance_p != NULL);
-  if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p,
+  if ((ue_context_p = ngap_get_ue_context(pdusession_modify_resp_p->gNB_ue_ngap_id)) == NULL) {
-                      pdusession_modify_resp_p->gNB_ue_ngap_id)) == NULL) {
    /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
-    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: 0x%08x\n",
+    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: 0x%08x\n", pdusession_modify_resp_p->gNB_ue_ngap_id);
-              pdusession_modify_resp_p->gNB_ue_ngap_id);
    return -1;
  }
  /* Uplink NAS transport can occur either during an ngap connected state
   * or during initial attach (for example: NAS authentication).
   */
-  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED ||
+  if (!(ue_context_p->ue_state == NGAP_UE_CONNECTED || ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
-          ue_context_p->ue_state == NGAP_UE_WAITING_CSR)) {
+    NGAP_WARN(
-    NGAP_WARN("You are attempting to send NAS data over non-connected "
+        "You are attempting to send NAS data over non-connected "
-              "gNB ue ngap id: %08x, current state: %d\n",
+        "gNB ue ngap id: %08x, current state: %d\n",
-              pdusession_modify_resp_p->gNB_ue_ngap_id, ue_context_p->ue_state);
+        pdusession_modify_resp_p->gNB_ue_ngap_id,
+        ue_context_p->ue_state);
    return -1;
  }
  /* Prepare the NGAP message to encode */
  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_successfulOutcome;
-  pdu.choice.successfulOutcome = (NGAP_SuccessfulOutcome_t *)calloc(1,sizeof(struct NGAP_SuccessfulOutcome));
+  asn1cCalloc(pdu.choice.successfulOutcome, head);
-  pdu.choice.successfulOutcome->procedureCode = NGAP_ProcedureCode_id_PDUSessionResourceModify;
+  head->procedureCode = NGAP_ProcedureCode_id_PDUSessionResourceModify;
-  pdu.choice.successfulOutcome->criticality = NGAP_Criticality_reject;
+  head->criticality = NGAP_Criticality_reject;
-  pdu.choice.successfulOutcome->value.present = NGAP_SuccessfulOutcome__value_PR_PDUSessionResourceModifyResponse;
+  head->value.present = NGAP_SuccessfulOutcome__value_PR_PDUSessionResourceModifyResponse;
-  out = &pdu.choice.successfulOutcome->value.choice.PDUSessionResourceModifyResponse;
+  NGAP_PDUSessionResourceModifyResponse_t *out = &head->value.choice.PDUSessionResourceModifyResponse;
  /* mandatory */
-  ie = (NGAP_PDUSessionResourceModifyResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyResponseIEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceModifyResponseIEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie = (NGAP_PDUSessionResourceModifyResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyResponseIEs_t));
-  ie->value.present = NGAP_PDUSessionResourceModifyResponseIEs__value_PR_AMF_UE_NGAP_ID;
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
-  asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    ie->criticality = NGAP_Criticality_ignore;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.present = NGAP_PDUSessionResourceModifyResponseIEs__value_PR_AMF_UE_NGAP_ID;
+    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    asn1cSeqAdd(&out->protocolIEs.list, ie);
+  }
  /* mandatory */
-  ie = (NGAP_PDUSessionResourceModifyResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyResponseIEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceModifyResponseIEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_PDUSessionResourceModifyResponseIEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.choice.RAN_UE_NGAP_ID = pdusession_modify_resp_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_PDUSessionResourceModifyResponseIEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = pdusession_modify_resp_p->gNB_ue_ngap_id;
+  }
  /* PDUSessionResourceModifyListModRes optional */
  if (pdusession_modify_resp_p->nb_of_pdusessions > 0) {
-    ie = (NGAP_PDUSessionResourceModifyResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyResponseIEs_t));
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceModifyResponseIEs_t, ie);
    ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceModifyListModRes;
    ie->criticality = NGAP_Criticality_ignore;
    ie->value.present = NGAP_PDUSessionResourceModifyResponseIEs__value_PR_PDUSessionResourceModifyListModRes;
-    for (i = 0; i < pdusession_modify_resp_p->nb_of_pdusessions; i++) {
+    for (int i = 0; i < pdusession_modify_resp_p->nb_of_pdusessions; i++) {
-      NGAP_PDUSessionResourceModifyItemModRes_t *item;
+      asn1cSequenceAdd(ie->value.choice.PDUSessionResourceModifyListModRes.list, NGAP_PDUSessionResourceModifyItemModRes_t, item);
-      NGAP_PDUSessionResourceModifyResponseTransfer_t *transfer_p = NULL;
-      item = (NGAP_PDUSessionResourceModifyItemModRes_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyItemModRes_t));
      item->pDUSessionID = pdusession_modify_resp_p->pdusessions[i].pdusession_id;
-      transfer_p = (NGAP_PDUSessionResourceModifyResponseTransfer_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyResponseTransfer_t));
+      NGAP_PDUSessionResourceModifyResponseTransfer_t transfer = {0};
-      transfer_p->qosFlowAddOrModifyResponseList = (NGAP_QosFlowAddOrModifyResponseList_t *)calloc(1, sizeof(NGAP_QosFlowAddOrModifyResponseList_t));
+      asn1cCalloc(transfer.qosFlowAddOrModifyResponseList, tmp);
-      uint8_t qos_flow_index;
+      for (int qos_flow_index = 0; qos_flow_index < pdusession_modify_resp_p->pdusessions[i].nb_of_qos_flow; qos_flow_index++) {
-      for (qos_flow_index = 0; qos_flow_index < pdusession_modify_resp_p->pdusessions[i].nb_of_qos_flow; qos_flow_index++) {
+        asn1cSequenceAdd(tmp->list, NGAP_QosFlowAddOrModifyResponseItem_t, qos);
-        NGAP_QosFlowAddOrModifyResponseItem_t *qosFlowAddOrModifyResponseItem_p = calloc(1, sizeof(NGAP_QosFlowAddOrModifyResponseItem_t));
+        qos->qosFlowIdentifier = pdusession_modify_resp_p->pdusessions[i].qos[qos_flow_index].qfi;
-        qosFlowAddOrModifyResponseItem_p->qosFlowIdentifier = 
-          pdusession_modify_resp_p->pdusessions[i].qos[qos_flow_index].qfi;
-        asn1cSeqAdd(&transfer_p->qosFlowAddOrModifyResponseList->list, qosFlowAddOrModifyResponseItem_p);
      }
+      asn_encode_to_new_buffer_result_t res = {0};
-      memset(&res, 0, sizeof(res));
+      NGAP_PDUSessionResourceModifyResponseTransfer_t *transfer_p = NULL;
      res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceModifyResponseTransfer, transfer_p);
      item->pDUSessionResourceModifyResponseTransfer.buf = res.buffer;
      item->pDUSessionResourceModifyResponseTransfer.size = res.result.encoded;
@@ -1209,82 +1080,70 @@ int ngap_gNB_pdusession_modify_resp(instance_t instance,
      ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceModifyResponseTransfer, transfer_p);
      NGAP_DEBUG("pdusession_modify_resp: modified pdusession ID %ld\n", item->pDUSessionID);
-      asn1cSeqAdd(&ie->value.choice.PDUSessionResourceModifyListModRes.list, item);
    }
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
  /* optional */
  if (pdusession_modify_resp_p->nb_of_pdusessions_failed > 0) {
-    ie = (NGAP_PDUSessionResourceModifyResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyResponseIEs_t));
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceModifyResponseIEs_t, ie);
    ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceFailedToModifyListModRes;
    ie->criticality = NGAP_Criticality_ignore;
    ie->value.present = NGAP_PDUSessionResourceModifyResponseIEs__value_PR_PDUSessionResourceFailedToModifyListModRes;
-    for (i = 0; i < pdusession_modify_resp_p->nb_of_pdusessions_failed; i++) {
+    for (int i = 0; i < pdusession_modify_resp_p->nb_of_pdusessions_failed; i++) {
-      NGAP_PDUSessionResourceFailedToModifyItemModRes_t *item;
+      asn1cSequenceAdd(ie->value.choice.PDUSessionResourceFailedToModifyListModRes.list, NGAP_PDUSessionResourceFailedToModifyItemModRes_t, item);
-      NGAP_PDUSessionResourceModifyUnsuccessfulTransfer_t *pdusessionTransfer_p = NULL;
-      item = (NGAP_PDUSessionResourceFailedToModifyItemModRes_t *)calloc(1, sizeof(NGAP_PDUSessionResourceFailedToModifyItemModRes_t));
      item->pDUSessionID = pdusession_modify_resp_p->pdusessions_failed[i].pdusession_id;
-      pdusessionTransfer_p = (NGAP_PDUSessionResourceModifyUnsuccessfulTransfer_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyUnsuccessfulTransfer_t));
+      NGAP_PDUSessionResourceModifyUnsuccessfulTransfer_t pdusessionTransfer = {0};
-      pdusessionTransfer_p->cause.present = pdusession_modify_resp_p->pdusessions_failed[i].cause;
+      pdusessionTransfer.cause.present = pdusession_modify_resp_p->pdusessions_failed[i].cause;
-      switch(pdusessionTransfer_p->cause.present) {
+      switch (pdusessionTransfer.cause.present) {
-      case NGAP_Cause_PR_radioNetwork:
+        case NGAP_Cause_PR_radioNetwork:
-          pdusessionTransfer_p->cause.choice.radioNetwork  = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
+          pdusessionTransfer.cause.choice.radioNetwork = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
          break;
      case NGAP_Cause_PR_transport:
-          pdusessionTransfer_p->cause.choice.transport     = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
+        pdusessionTransfer.cause.choice.transport = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
-          break;
+        break;
      case NGAP_Cause_PR_nas:
-          pdusessionTransfer_p->cause.choice.nas           = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
+        pdusessionTransfer.cause.choice.nas = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
-          break;
+        break;
      case NGAP_Cause_PR_protocol:
-          pdusessionTransfer_p->cause.choice.protocol      = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
+        pdusessionTransfer.cause.choice.protocol = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
-          break;
+        break;
      case NGAP_Cause_PR_misc:
-          pdusessionTransfer_p->cause.choice.misc          = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
+        pdusessionTransfer.cause.choice.misc = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
-          break;
+        break;
      case NGAP_Cause_PR_NOTHING:
      default:
          break;
      }
-      memset(&res, 0, sizeof(res));
+      asn_encode_to_new_buffer_result_t res = {0};
-      res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceModifyUnsuccessfulTransfer, pdusessionTransfer_p);
+      NGAP_PDUSessionResourceModifyUnsuccessfulTransfer_t *pdusessionTransfer_p = NULL;
+      res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceModifyUnsuccessfulTransfer, &pdusessionTransfer);
      item->pDUSessionResourceModifyUnsuccessfulTransfer.buf = res.buffer;
      item->pDUSessionResourceModifyUnsuccessfulTransfer.size = res.result.encoded;
      ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceModifyUnsuccessfulTransfer, pdusessionTransfer_p);
      NGAP_DEBUG("pdusession_modify_resp: failed pdusession ID %ld\n", item->pDUSessionID);
-      asn1cSeqAdd(&ie->value.choice.PDUSessionResourceFailedToModifyListModRes.list, item);
    }
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
  /* optional */
  if (0) {
-    ie = (NGAP_PDUSessionResourceModifyResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceModifyResponseIEs_t));
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceModifyResponseIEs_t, ie);
    ie->id = NGAP_ProtocolIE_ID_id_CriticalityDiagnostics;
    ie->criticality = NGAP_Criticality_ignore;
    ie->value.present = NGAP_PDUSessionResourceModifyResponseIEs__value_PR_CriticalityDiagnostics;
    // ie->value.choice.CriticalityDiagnostics = ;
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
  }
-  fprintf(stderr, "start encode\n");
  if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
    NGAP_ERROR("Failed to encode uplink transport\n");
    /* Encode procedure has failed... */
@@ -1292,22 +1151,17 @@ int ngap_gNB_pdusession_modify_resp(instance_t instance,
  }
  /* UE associated signalling -> use the allocated stream */
-  ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
+  ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance, ue_context_p->amf_ref->assoc_id, buffer, length, ue_context_p->tx_stream);
-                                   ue_context_p->amf_ref->assoc_id, buffer,
-                                   length, ue_context_p->tx_stream);
  return 0;
 }
 //------------------------------------------------------------------------------
-int ngap_gNB_pdusession_release_resp(instance_t instance,
+int ngap_gNB_pdusession_release_resp(instance_t instance, ngap_pdusession_release_resp_t *pdusession_release_resp_p)
-                                ngap_pdusession_release_resp_t *pdusession_release_resp_p)
 //------------------------------------------------------------------------------
 {
  ngap_gNB_instance_t            *ngap_gNB_instance_p = NULL;
  struct ngap_gNB_ue_context_s   *ue_context_p        = NULL;
-  NGAP_NGAP_PDU_t                 pdu;
+  NGAP_NGAP_PDU_t pdu;
-  NGAP_PDUSessionResourceReleaseResponse_t    *out;
-  NGAP_PDUSessionResourceReleaseResponseIEs_t *ie;
  uint8_t  *buffer  = NULL;
  uint32_t length;
  int      i;
@@ -1316,68 +1170,52 @@ int ngap_gNB_pdusession_release_resp(instance_t instance,
  DevAssert(pdusession_release_resp_p != NULL);
  DevAssert(ngap_gNB_instance_p != NULL);
-  if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p,
+  if ((ue_context_p = ngap_get_ue_context(pdusession_release_resp_p->gNB_ue_ngap_id)) == NULL) {
-                      pdusession_release_resp_p->gNB_ue_ngap_id)) == NULL) {
    /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
-    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: 0x%08x\n",
+    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: 0x%08x\n", pdusession_release_resp_p->gNB_ue_ngap_id);
-              pdusession_release_resp_p->gNB_ue_ngap_id);
    return -1;
  }
  /* Prepare the NGAP message to encode */
  memset(&pdu, 0, sizeof(pdu));
  pdu.present = NGAP_NGAP_PDU_PR_successfulOutcome;
-  pdu.choice.successfulOutcome = (NGAP_SuccessfulOutcome_t *)calloc(1,sizeof(struct NGAP_SuccessfulOutcome));
+  asn1cCalloc(pdu.choice.successfulOutcome, head);
-  pdu.choice.successfulOutcome->procedureCode = NGAP_ProcedureCode_id_PDUSessionResourceRelease;
+  head->procedureCode = NGAP_ProcedureCode_id_PDUSessionResourceRelease;
-  pdu.choice.successfulOutcome->criticality = NGAP_Criticality_reject;
+  head->criticality = NGAP_Criticality_reject;
-  pdu.choice.successfulOutcome->value.present = NGAP_SuccessfulOutcome__value_PR_PDUSessionResourceReleaseResponse;
+  head->value.present = NGAP_SuccessfulOutcome__value_PR_PDUSessionResourceReleaseResponse;
-  out = &pdu.choice.successfulOutcome->value.choice.PDUSessionResourceReleaseResponse;
+  NGAP_PDUSessionResourceReleaseResponse_t *out = &head->value.choice.PDUSessionResourceReleaseResponse;
  /* mandatory */
-  ie = (NGAP_PDUSessionResourceReleaseResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceReleaseResponseIEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceReleaseResponseIEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
-  ie->value.present = NGAP_PDUSessionResourceReleaseResponseIEs__value_PR_AMF_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_ignore;
-  asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+    ie->value.present = NGAP_PDUSessionResourceReleaseResponseIEs__value_PR_AMF_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
+  }
  /* mandatory */
-  ie = (NGAP_PDUSessionResourceReleaseResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceReleaseResponseIEs_t));
+  {
-  ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceReleaseResponseIEs_t, ie);
-  ie->criticality = NGAP_Criticality_ignore;
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
-  ie->value.present = NGAP_PDUSessionResourceReleaseResponseIEs__value_PR_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_ignore;
-  ie->value.choice.RAN_UE_NGAP_ID = pdusession_release_resp_p->gNB_ue_ngap_id;
+    ie->value.present = NGAP_PDUSessionResourceReleaseResponseIEs__value_PR_RAN_UE_NGAP_ID;
-  asn1cSeqAdd(&out->protocolIEs.list, ie);
+    ie->value.choice.RAN_UE_NGAP_ID = pdusession_release_resp_p->gNB_ue_ngap_id;
+  }
    /* optional */
    if (pdusession_release_resp_p->nb_of_pdusessions_released > 0) {
-        ie = (NGAP_PDUSessionResourceReleaseResponseIEs_t *)calloc(1, sizeof(NGAP_PDUSessionResourceReleaseResponseIEs_t));
+      asn1cSequenceAdd(out->protocolIEs.list, NGAP_PDUSessionResourceReleaseResponseIEs_t, ie);
-        ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceReleasedListRelRes;
+      ie->id = NGAP_ProtocolIE_ID_id_PDUSessionResourceReleasedListRelRes;
-        ie->criticality = NGAP_Criticality_ignore;
+      ie->criticality = NGAP_Criticality_ignore;
-        ie->value.present = NGAP_PDUSessionResourceReleaseResponseIEs__value_PR_PDUSessionResourceReleasedListRelRes;
+      ie->value.present = NGAP_PDUSessionResourceReleaseResponseIEs__value_PR_PDUSessionResourceReleasedListRelRes;
-        for (i = 0; i < pdusession_release_resp_p->nb_of_pdusessions_released; i++) {
-            NGAP_PDUSessionResourceReleasedItemRelRes_t *item;
-            item = (NGAP_PDUSessionResourceReleasedItemRelRes_t *)calloc(1, sizeof(NGAP_PDUSessionResourceReleasedItemRelRes_t));
-            item->pDUSessionID = pdusession_release_resp_p->pdusession_release[i].pdusession_id;
-            if(pdusession_release_resp_p->pdusession_release[i].transfer_length > 0){
-                item->pDUSessionResourceReleaseResponseTransfer.size = pdusession_release_resp_p->pdusession_release[i].transfer_length;
-                item->pDUSessionResourceReleaseResponseTransfer.buf = malloc(sizeof(uint8_t) * pdusession_release_resp_p->pdusession_release[i].transfer_length);
-                memcpy(item->pDUSessionResourceReleaseResponseTransfer.buf,
-                       pdusession_release_resp_p->pdusession_release[i].transfer_buffer,
-                       pdusession_release_resp_p->pdusession_release[i].transfer_length);
-            }else {
-                item->pDUSessionResourceReleaseResponseTransfer.size = 0;
-                item->pDUSessionResourceReleaseResponseTransfer.buf = NULL;
-                NGAP_DEBUG("pdusession_release_resp: transfer_buffer is NULL!\n");
-            }
-            NGAP_DEBUG("pdusession_release_resp: pdusession ID %ld\n", item->pDUSessionID);
-            asn1cSeqAdd(&ie->value.choice.PDUSessionResourceReleasedListRelRes.list, item);
-        }
-    asn1cSeqAdd(&out->protocolIEs.list, ie);
+      for (i = 0; i < pdusession_release_resp_p->nb_of_pdusessions_released; i++) {
+        asn1cSequenceAdd(ie->value.choice.PDUSessionResourceReleasedListRelRes.list, NGAP_PDUSessionResourceReleasedItemRelRes_t, item);
+        item->pDUSessionID = pdusession_release_resp_p->pdusession_release[i].pdusession_id;
+        allocCopy(&item->pDUSessionResourceReleaseResponseTransfer, pdusession_release_resp_p->pdusession_release[i].data);
+        NGAP_DEBUG("pdusession_release_resp: pdusession ID %ld\n", item->pDUSessionID);
+      }
  }
  if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
    NGAP_ERROR("Failed to encode release response\n");
    /* Encode procedure has failed... */
@@ -1385,17 +1223,17 @@ int ngap_gNB_pdusession_release_resp(instance_t instance,
  }
  /* UE associated signalling -> use the allocated stream */
-  ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance,
+  ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance, ue_context_p->amf_ref->assoc_id, buffer, length, ue_context_p->tx_stream);
-                                   ue_context_p->amf_ref->assoc_id, buffer,
-                                   length, ue_context_p->tx_stream);
  NGAP_INFO("pdusession_release_response sended gNB_UE_NGAP_ID %u  amf_ue_ngap_id %lu nb_of_pdusessions_released %d nb_of_pdusessions_failed %d\n",
-            pdusession_release_resp_p->gNB_ue_ngap_id, (uint64_t)ue_context_p->amf_ue_ngap_id,pdusession_release_resp_p->nb_of_pdusessions_released,pdusession_release_resp_p->nb_of_pdusessions_failed);
+            pdusession_release_resp_p->gNB_ue_ngap_id,
+            (uint64_t)ue_context_p->amf_ue_ngap_id,
+            pdusession_release_resp_p->nb_of_pdusessions_released,
+            pdusession_release_resp_p->nb_of_pdusessions_failed);
  return 0;
 }
-int ngap_gNB_path_switch_req(instance_t instance,
+int ngap_gNB_path_switch_req(instance_t instance, ngap_path_switch_req_t *path_switch_req_p)
-                             ngap_path_switch_req_t *path_switch_req_p)
 //------------------------------------------------------------------------------
 {
  //TODO
@@ -1403,13 +1241,9 @@ int ngap_gNB_path_switch_req(instance_t instance,
  return 0;
 }
-int ngap_gNB_generate_PDUSESSION_Modification_Indication(
+int ngap_gNB_generate_PDUSESSION_Modification_Indication(instance_t instance, ngap_pdusession_modification_ind_t *pdusession_modification_ind)
-		instance_t instance,
-  ngap_pdusession_modification_ind_t *pdusession_modification_ind)
 //-----------------------------------------------------------------------------
 {
  //TODO
  return 0;
 }
--- a/openair3/NGAP/ngap_gNB_trace.h
+++ b/openair3/NGAP/ngap_gNB_trace.h
@@ -30,23 +30,10 @@
 #ifndef NGAP_GNB_TRACE_H_
 #define NGAP_GNB_TRACE_H_
-// int ngap_gNB_generate_trace_failure(sctp_data_t        *sctp_data_p,
-//                                     int32_t             stream,
-//                                     uint32_t            gNB_ue_ngap_id,
-//                                     uint32_t            amf_ue_ngap_id,
-//                                     E_UTRAN_Trace_ID_t *trace_id,
-//                                     Cause_t            *cause_p);
-// int ngap_gNB_handle_trace_start(gNB_amf_desc_t *gNB_desc_p,
-//                                 sctp_queue_item_t *packet_p,
-//                                 struct ngap_message_s *message_p);
 int ngap_gNB_handle_trace_start(uint32_t         assoc_id,
                                uint32_t         stream,
                                NGAP_NGAP_PDU_t *pdu);
-// int ngap_gNB_handle_deactivate_trace(gNB_amf_desc_t *gNB_desc_p,
-//                                      sctp_queue_item_t *packet_p,
-//                                      struct ngap_message_s *message_p);
 int ngap_gNB_handle_deactivate_trace(uint32_t         assoc_id,
                                     uint32_t         stream,
                                     NGAP_NGAP_PDU_t *pdu);

--- a/openair3/NGAP/ngap_gNB_ue_context.c
+++ b/openair3/NGAP/ngap_gNB_ue_context.c
@@ -40,8 +40,15 @@
 #include "ngap_gNB_defs.h"
 #include "ngap_gNB_ue_context.h"
-int ngap_gNB_compare_gNB_ue_ngap_id(
+/* Tree of UE ordered by gNB_ue_ngap_id's
-  struct ngap_gNB_ue_context_s *p1, struct ngap_gNB_ue_context_s *p2)
+ * NO INSTANCE, the 32 bits id is large enough to handle all UEs, regardless the cell, gNB, ...
+ */
+static RB_HEAD(ngap_ue_map, ngap_gNB_ue_context_s) ngap_ue_head = RB_INITIALIZER(root);
+/* Generate the tree management functions prototypes */
+RB_PROTOTYPE(ngap_ue_map, ngap_gNB_ue_context_s, entries, ngap_gNB_compare_gNB_ue_ngap_id);
+static int ngap_gNB_compare_gNB_ue_ngap_id(struct ngap_gNB_ue_context_s *p1, struct ngap_gNB_ue_context_s *p2)
 {
  if (p1->gNB_ue_ngap_id > p2->gNB_ue_ngap_id) {
    return 1;
@@ -58,46 +65,26 @@ int ngap_gNB_compare_gNB_ue_ngap_id(
 RB_GENERATE(ngap_ue_map, ngap_gNB_ue_context_s, entries,
            ngap_gNB_compare_gNB_ue_ngap_id);
-struct ngap_gNB_ue_context_s *ngap_gNB_allocate_new_UE_context(void)
+void ngap_store_ue_context(struct ngap_gNB_ue_context_s *ue_desc_p)
 {
-  struct ngap_gNB_ue_context_s *new_p;
+  if (!RB_INSERT(ngap_ue_map, &ngap_ue_head, ue_desc_p))
+    LOG_E(NGAP, "Bug in UE uniq number allocation %u, we try to add a existing UE\n", ue_desc_p->gNB_ue_ngap_id);
-  new_p = malloc(sizeof(struct ngap_gNB_ue_context_s));
+  return;
-  if (new_p == NULL) {
-    NGAP_ERROR("Cannot allocate new ue context\n");
-    return NULL;
-  }
-  memset(new_p, 0, sizeof(struct ngap_gNB_ue_context_s));
-  return new_p;
 }
-struct ngap_gNB_ue_context_s *ngap_gNB_get_ue_context(
+struct ngap_gNB_ue_context_s *ngap_get_ue_context(uint32_t gNB_ue_ngap_id)
-  ngap_gNB_instance_t *instance_p,
-  uint32_t gNB_ue_ngap_id)
 {
-  ngap_gNB_ue_context_t temp;
+  ngap_gNB_ue_context_t temp = {.gNB_ue_ngap_id = gNB_ue_ngap_id};
+  return RB_FIND(ngap_ue_map, &ngap_ue_head, &temp);
-  memset(&temp, 0, sizeof(struct ngap_gNB_ue_context_s));
-  /* gNB ue ngap id = 32 bits wide */
-  temp.gNB_ue_ngap_id = gNB_ue_ngap_id & 0xFFFFFFFF;
-  return RB_FIND(ngap_ue_map, &instance_p->ngap_ue_head, &temp);
 }
-void ngap_gNB_free_ue_context(struct ngap_gNB_ue_context_s *ue_context_p)
+struct ngap_gNB_ue_context_s *ngap_detach_ue_context(uint32_t gNB_ue_ngap_id)
 {
-  if (ue_context_p == NULL) {
+  struct ngap_gNB_ue_context_s *tmp = ngap_get_ue_context(gNB_ue_ngap_id);
-    NGAP_ERROR("Trying to free a NULL context\n");
+  if (tmp == NULL) {
-    return;
+    NGAP_ERROR("Trying to free a NULL UE context, %u\n", gNB_ue_ngap_id);
+    return NULL;
  }
+  RB_REMOVE(ngap_ue_map, &ngap_ue_head, tmp);
-  /* TODO: check that context is currently not in the tree of known
+  return tmp;
-   * contexts.
-   */
-  free(ue_context_p);
 }
--- a/openair3/NGAP/ngap_gNB_ue_context.h
+++ b/openair3/NGAP/ngap_gNB_ue_context.h
@@ -37,7 +37,6 @@
 // Forward declarations
 struct ngap_gNB_amf_data_s;
-struct ngap_ue_map;
 struct gNB_amf_desc_s;
 typedef enum {
@@ -59,9 +58,6 @@ typedef struct ngap_gNB_ue_context_s {
   */
  uint32_t gNB_ue_ngap_id;
-  /* UE id for initial connection to NGAP */
-  uint16_t ue_initial_id;
  /* Uniquely identifies the UE within AMF. Encoded on 32 bits. */
  uint64_t amf_ue_ngap_id:40;
@@ -84,20 +80,9 @@ typedef struct ngap_gNB_ue_context_s {
  ngap_gNB_instance_t *gNB_instance;
 } ngap_gNB_ue_context_t;
-int ngap_gNB_compare_gNB_ue_ngap_id(
+void ngap_store_ue_context(ngap_gNB_ue_context_t *ue_desc_p);
-  struct ngap_gNB_ue_context_s *p1, struct ngap_gNB_ue_context_s *p2);
-/* Generate the tree management functions prototypes */
-RB_PROTOTYPE(ngap_ue_map, ngap_gNB_ue_context_s, entries,
-             ngap_gNB_compare_gNB_ue_ngap_id);
-struct ngap_gNB_ue_context_s *ngap_gNB_allocate_new_UE_context(void);
-struct ngap_gNB_ue_context_s *ngap_gNB_get_ue_context(
-  ngap_gNB_instance_t *instance_p,
-  uint32_t gNB_ue_ngap_id);
-void ngap_gNB_free_ue_context(struct ngap_gNB_ue_context_s *ue_context_p);
+ngap_gNB_ue_context_t *ngap_get_ue_context(uint32_t gNB_ue_ngap_id);
+ngap_gNB_ue_context_t *ngap_detach_ue_context(uint32_t gNB_ue_ngap_id);
 #endif /* NGAP_GNB_UE_CONTEXT_H_ */