Merge branch 'develop' into NR_RRC_PRACH_procedures
Conflicts: executables/nr-ue.c openair1/PHY/NR_TRANSPORT/nr_dci_tools.c openair1/PHY/NR_UE_TRANSPORT/nr_prach.c openair1/PHY/defs_RU.h openair1/SCHED_NR_UE/phy_procedures_nr_ue.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c openair2/RRC/NR/rrc_gNB_nsa.c openair2/X2AP/x2ap_eNB_handler.c
This commit is contained in:
@@ -107,7 +107,7 @@ void* socket_udp_open(int type, const char* host, const char* port)
|
||||
{
|
||||
struct addrinfo socket_info; /* endpoint information */
|
||||
struct addrinfo *socket_addr, *sp; /* endpoint address */
|
||||
int sfd; /* socket file descriptor */
|
||||
int sfd=-1; /* socket file descriptor */
|
||||
|
||||
/*
|
||||
* Parameters sanity check
|
||||
|
||||
@@ -80,7 +80,7 @@ bool parse_plmn_param(config_setting_t *plmn_setting, plmn_conf_param_t *conf) {
|
||||
|
||||
bool parse_plmns(config_setting_t *all_plmn_setting, networks_t *networks) {
|
||||
config_setting_t *plmn_setting = NULL;
|
||||
char plmn[10];
|
||||
char plmn[100];
|
||||
int size = 0;
|
||||
|
||||
size = config_setting_length(all_plmn_setting);
|
||||
|
||||
@@ -13,7 +13,7 @@ bool parse_config_file(const char *output_dir, const char *conf_filename, int ou
|
||||
config_setting_t *root_setting = NULL;
|
||||
config_setting_t *ue_setting = NULL;
|
||||
config_setting_t *all_plmn_setting = NULL;
|
||||
char user[10];
|
||||
char user[100];
|
||||
config_t cfg;
|
||||
|
||||
networks_t networks;;
|
||||
|
||||
Reference in New Issue
Block a user