From 204281e3afe5666689b0dcea07a38f22546b4516 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Sun, 17 Jun 2018 13:48:39 +0200
Subject: [PATCH] change types in RCconfig_flexran(), avoid seg fault
the integration of the nfapi-L2-emulator-for-develop (f254107b2) added more
types in the RCconfig_flexran(), but they were partially wrong. This commit
fixes those types after the rebase of this branch on top of 2018.w19
---
openair2/ENB_APP/enb_config.c | 91 +++++++++++++++++------------------
1 file changed, 44 insertions(+), 47 deletions(-)
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 195ab17877..6d9b2edf82 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -101,54 +101,51 @@ void RCconfig_flexran()
ue_TimersAndConstants_t300, ue_TimersAndConstants_t301,
ue_TimersAndConstants_t310, ue_TimersAndConstants_t311,
ue_TimersAndConstants_n310, ue_TimersAndConstants_n311,
- ue_TransmissionMode;
-
- int32_t ue_multiple_max = 0;
-
- e_SL_CP_Len_r12 rxPool_sc_CP_Len;
- e_SL_PeriodComm_r12 rxPool_sc_Period;
- e_SL_CP_Len_r12 rxPool_data_CP_Len;
- long rxPool_ResourceConfig_prb_Num;
- long rxPool_ResourceConfig_prb_Start;
- long rxPool_ResourceConfig_prb_End;
- SL_OffsetIndicator_r12_PR rxPool_ResourceConfig_offsetIndicator_present;
- long rxPool_ResourceConfig_offsetIndicator_choice;
- SubframeBitmapSL_r12_PR rxPool_ResourceConfig_subframeBitmap_present;
- char* rxPool_ResourceConfig_subframeBitmap_choice_bs_buf;
- long rxPool_ResourceConfig_subframeBitmap_choice_bs_size;
- long rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused;
-
- //SIB19
- //for discRxPool
- SL_CP_Len_r12_t discRxPool_cp_Len;
- e_SL_DiscResourcePool_r12__discPeriod_r12 discRxPool_discPeriod;
- long discRxPool_numRetx;
- long discRxPool_numRepetition;
- long discRxPool_ResourceConfig_prb_Num;
- long discRxPool_ResourceConfig_prb_Start;
- long discRxPool_ResourceConfig_prb_End;
- SL_OffsetIndicator_r12_PR discRxPool_ResourceConfig_offsetIndicator_present;
- long discRxPool_ResourceConfig_offsetIndicator_choice;
- SubframeBitmapSL_r12_PR discRxPool_ResourceConfig_subframeBitmap_present;
- char* discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf;
- long discRxPool_ResourceConfig_subframeBitmap_choice_bs_size;
- long discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused;
- //for discRxPoolPS
- SL_CP_Len_r12_t discRxPoolPS_cp_Len;
- e_SL_DiscResourcePool_r12__discPeriod_r12 discRxPoolPS_discPeriod;
- long discRxPoolPS_numRetx;
- long discRxPoolPS_numRepetition;
- long discRxPoolPS_ResourceConfig_prb_Num;
- long discRxPoolPS_ResourceConfig_prb_Start;
- long discRxPoolPS_ResourceConfig_prb_End;
- SL_OffsetIndicator_r12_PR discRxPoolPS_ResourceConfig_offsetIndicator_present;
- long discRxPoolPS_ResourceConfig_offsetIndicator_choice;
- SubframeBitmapSL_r12_PR discRxPoolPS_ResourceConfig_subframeBitmap_present;
- char* discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_buf;
- long discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_size;
- long discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_bits_unused;
-
+ ue_TransmissionMode, ue_multiple_max;
+
+ const char* rxPool_sc_CP_Len;
+ const char* rxPool_sc_Period;
+ const char* rxPool_data_CP_Len;
+ libconfig_int rxPool_ResourceConfig_prb_Num;
+ libconfig_int rxPool_ResourceConfig_prb_Start;
+ libconfig_int rxPool_ResourceConfig_prb_End;
+ const char* rxPool_ResourceConfig_offsetIndicator_present;
+ libconfig_int rxPool_ResourceConfig_offsetIndicator_choice;
+ const char* rxPool_ResourceConfig_subframeBitmap_present;
+ char* rxPool_ResourceConfig_subframeBitmap_choice_bs_buf;
+ libconfig_int rxPool_ResourceConfig_subframeBitmap_choice_bs_size;
+ libconfig_int rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused;
+ //SIB19
+ //for discRxPool
+ const char* discRxPool_cp_Len;
+ const char* discRxPool_discPeriod;
+ libconfig_int discRxPool_numRetx;
+ libconfig_int discRxPool_numRepetition;
+ libconfig_int discRxPool_ResourceConfig_prb_Num;
+ libconfig_int discRxPool_ResourceConfig_prb_Start;
+ libconfig_int discRxPool_ResourceConfig_prb_End;
+ const char* discRxPool_ResourceConfig_offsetIndicator_present;
+ libconfig_int discRxPool_ResourceConfig_offsetIndicator_choice;
+ const char* discRxPool_ResourceConfig_subframeBitmap_present;
+ char* discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf;
+ libconfig_int discRxPool_ResourceConfig_subframeBitmap_choice_bs_size;
+ libconfig_int discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused;
+
+ //for discRxPoolPS
+ const char* discRxPoolPS_cp_Len;
+ const char* discRxPoolPS_discPeriod;
+ libconfig_int discRxPoolPS_numRetx;
+ libconfig_int discRxPoolPS_numRepetition;
+ libconfig_int discRxPoolPS_ResourceConfig_prb_Num;
+ libconfig_int discRxPoolPS_ResourceConfig_prb_Start;
+ libconfig_int discRxPoolPS_ResourceConfig_prb_End;
+ const char* discRxPoolPS_ResourceConfig_offsetIndicator_present;
+ libconfig_int discRxPoolPS_ResourceConfig_offsetIndicator_choice;
+ const char* discRxPoolPS_ResourceConfig_subframeBitmap_present;
+ char* discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_buf;
+ libconfig_int discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_size;
+ libconfig_int discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_bits_unused;
/* get number of eNBs */
paramdef_t ENBSParams[] = ENBSPARAMS_DESC;
--
GitLab