cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

sgsn init: pass sgsn_config pointer to sgsn_vty_init(), not sgsn_parse_config 

In an upcoming commit, sgsn_vty_init() will require access to the global sgsn
config struct to initialize a generic VTY command with the proper config
destination address, see Change-Id I5b5b6a9678b458affa86800afb1ec726e66eed88.

Change-Id: Ie6b6e5422987586531a898e0c5b867623dbecb0f
This commit is contained in:
Neels Hofmeyr 2017-07-20 14:41:20 +02:00
parent e2f24d53e4
commit 4283675311
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/openbsc/sgsn.h
View File

@ -140,8 +140,8 @@ extern struct sgsn_instance *sgsn;
/* sgsn_vty.c */ /* sgsn_vty.c */
int sgsn_vty_init(void); int sgsn_vty_init(struct sgsn_config *cfg);
int sgsn_parse_config(const char *config_file, struct sgsn_config *cfg); int sgsn_parse_config(const char *config_file);
/* sgsn.c */ /* sgsn.c */

4
src/gprs/sgsn_main.c
View File

@ -350,7 +350,7 @@ int main(int argc, char **argv)
vty_init(&vty_info); vty_init(&vty_info);
logging_vty_add_cmds(NULL); logging_vty_add_cmds(NULL);
osmo_stats_vty_add_cmds(&gprs_log_info); osmo_stats_vty_add_cmds(&gprs_log_info);
sgsn_vty_init(); sgsn_vty_init(&sgsn_inst.cfg);
ctrl_vty_init(tall_bsc_ctx); ctrl_vty_init(tall_bsc_ctx);
#ifdef BUILD_IU #ifdef BUILD_IU
iu_vty_init(&asn_debug); iu_vty_init(&asn_debug);
@ -382,7 +382,7 @@ int main(int argc, char **argv)
sgsn_cdr_init(&sgsn_inst); sgsn_cdr_init(&sgsn_inst);
/* FIXME: register signal handler for SS_L_NS */ /* FIXME: register signal handler for SS_L_NS */
rc = sgsn_parse_config(sgsn_inst.config_file, &sgsn_inst.cfg); rc = sgsn_parse_config(sgsn_inst.config_file);
if (rc < 0) { if (rc < 0) {
LOGP(DGPRS, LOGL_FATAL, "Error in config file\n"); LOGP(DGPRS, LOGL_FATAL, "Error in config file\n");
exit(2); exit(2);

9
src/gprs/sgsn_vty.c
View File

@ -1222,8 +1222,10 @@ DEFUN(cfg_comp_v42bisp, cfg_comp_v42bisp_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
int sgsn_vty_init(void) int sgsn_vty_init(struct sgsn_config *cfg)
{ {
g_cfg = cfg;
install_element_ve(&show_sgsn_cmd); install_element_ve(&show_sgsn_cmd);
//install_element_ve(&show_mmctx_tlli_cmd); //install_element_ve(&show_mmctx_tlli_cmd);
install_element_ve(&show_mmctx_imsi_cmd); install_element_ve(&show_mmctx_imsi_cmd);
@ -1285,11 +1287,12 @@ int sgsn_vty_init(void)
return 0; return 0;
} }
int sgsn_parse_config(const char *config_file, struct sgsn_config *cfg) int sgsn_parse_config(const char *config_file)
{ {
int rc; int rc;
g_cfg = cfg; /* make sure sgsn_vty_init() was called before this */
OSMO_ASSERT(g_cfg);
g_cfg->timers.T3312 = GSM0408_T3312_SECS; g_cfg->timers.T3312 = GSM0408_T3312_SECS;
g_cfg->timers.T3322 = GSM0408_T3322_SECS; g_cfg->timers.T3322 = GSM0408_T3322_SECS;