From bf2fefbfd59871d46d0d177638d48d40c75899b3 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sun, 20 Dec 2009 22:12:01 +0100 Subject: [PATCH 1/1] Make LCR run with OpenBSC main branch. modified: default/gsm.conf modified: gsm.cpp modified: gsm_conf.c --- default/gsm.conf | 3 --- gsm.cpp | 4 ---- gsm_conf.c | 8 ++------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/default/gsm.conf b/default/gsm.conf index 456dbf3..d0a9c6f 100644 --- a/default/gsm.conf +++ b/default/gsm.conf @@ -25,9 +25,6 @@ # The database is located at /usr/local/lcr by default. #hlr hlr.sqlite3 -# How to reject unknown subscribers. -#reject-cause 0 - # To keep layer 2 connection to BS11 when quitting, use this option. # It is only usefull for developing. TRX will stay on. # Also changes in frequency, mcc, mnc, lac while keeping layer 2 will cause diff --git a/gsm.cpp b/gsm.cpp index b1895f8..cd3aa8f 100644 --- a/gsm.cpp +++ b/gsm.cpp @@ -1658,10 +1658,6 @@ int gsm_init(void) } gsm->network = bsc_gsmnet; - /* set reject cause */ - if (gsm->conf.reject_cause) - gsm0408_set_reject_cause(gsm->conf.reject_cause); - /* open gsm loop interface */ if (gsm_sock_open(gsm->conf.interface_bsc)) { return gsm_exit(-1); diff --git a/gsm_conf.c b/gsm_conf.c index efde7bd..560d9b3 100644 --- a/gsm_conf.c +++ b/gsm_conf.c @@ -141,12 +141,8 @@ int gsm_conf(struct gsm_conf *gsm_conf) } else if (!strcmp(option,"reject-cause")) { - if (params[0][0]==0) { - SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option); - goto error; - } - gsm_conf->reject_cause = atoi(params[0]); - + SPRINT(gsm_conf_error, "Option '%s' in gsm.conf has moved to openbsc.cfg", option); + goto error; } else if (!strcmp(option,"allow-all")) { gsm_conf->allow_all = 1; -- 2.13.6