maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(conf2uedata): clarify error message when config file does not exists

Browse Source
This commit is contained in:
Frédéric Leroy
2017-01-25 13:29:48 +01:00
parent fe2193ba75
commit 33b2d11fc2
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/NAS/TOOLS/conf2uedata.c
+28 -15
View File
@@ -7,10 +7,12 @@
#include "utils.h" #include "utils.h"
char * make_filename(const char *output_dir, const char *filename, int ueid); char * make_filename(const char *output_dir, const char *filename, int ueid);
int get_config_from_file(const char *filename, config_t *config);
int main(int argc, char**argv) { int main(int argc, char**argv) {
int rc = EXIT_SUCCESS; int rc = EXIT_SUCCESS;
int option; int option;
const char* conf_file = NULL;
while ((option = getopt(argc, argv, options)) != -1) { while ((option = getopt(argc, argv, options)) != -1) {
switch (option) { switch (option) {
case 'c': case 'c':
@@ -42,26 +44,17 @@ int main(int argc, char**argv) {
_display_usage(); _display_usage();
return EXIT_FAILURE; return EXIT_FAILURE;
} else if (parse_data) { } else if (parse_data) {
int ret;
int ue_nb = 0; int ue_nb = 0;
config_t cfg;
config_setting_t *root_setting = NULL; config_setting_t *root_setting = NULL;
config_setting_t *ue_setting = NULL; config_setting_t *ue_setting = NULL;
config_setting_t *all_plmn_setting = NULL; config_setting_t *all_plmn_setting = NULL;
char user[10]; char user[10];
config_init(&cfg); config_t cfg;
if (conf_file != NULL) { ret = get_config_from_file(conf_file, &cfg);
/* Read the file. If there is an error, report it and exit. */ if (ret == EXIT_FAILURE) {
if (!config_read_file(&cfg, conf_file)) { exit(1);
fprintf(stderr, "%s:%d - %s\n", config_error_file(&cfg), }
config_error_line(&cfg), config_error_text(&cfg));
config_destroy(&cfg);
return (EXIT_FAILURE);
}
} else {
config_destroy(&cfg);
perror("ERROR\t: config_read failed");
exit(EXIT_FAILURE);
}
root_setting = config_root_setting(&cfg); root_setting = config_root_setting(&cfg);
ue_nb = config_setting_length(root_setting) - 1; ue_nb = config_setting_length(root_setting) - 1;
all_plmn_setting = config_setting_get_member(root_setting, PLMN); all_plmn_setting = config_setting_get_member(root_setting, PLMN);
@@ -112,6 +105,26 @@ int main(int argc, char**argv) {
} }
int get_config_from_file(const char *filename, config_t *config) {
config_init(config);
if (filename == NULL) {
// XXX write error message ?
exit(EXIT_FAILURE);
}
/* Read the file. If there is an error, report it and exit. */
if (!config_read_file(config, filename)) {
fprintf(stderr, "Cant read config file '%s': %s\n", filename,
config_error_text(config));
if ( config_error_type(config) == CONFIG_ERR_PARSE ) {
fprintf(stderr, "This is line %d\n", config_error_line(config));
}
config_destroy(config);
return (EXIT_FAILURE);
}
return EXIT_SUCCESS;
}
void gen_usim_data(int user_id) { void gen_usim_data(int user_id) {
usim_data_t usim_data = { }; usim_data_t usim_data = { };
memset(&usim_data, 0, sizeof(usim_data_t)); memset(&usim_data, 0, sizeof(usim_data_t));
openair3/NAS/TOOLS/conf2uedata.h
-1
View File
@@ -98,7 +98,6 @@ const char options[]="c:o:h";
unsigned char parse_data=FALSE; unsigned char parse_data=FALSE;
unsigned char print_data=FALSE; unsigned char print_data=FALSE;
unsigned char output=FALSE; unsigned char output=FALSE;
const char* conf_file = NULL;
const char* output_dir = NULL; const char* output_dir = NULL;
const char* imsi=NULL; const char* imsi=NULL;