From 2732c3ce40d8e0b3875b5a0c933c98f27c8cbae9 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Wed, 17 Mar 2010 08:31:07 +0100 Subject: Fixed output problems of error messages while parsing options.conf / gsm.conf. modified: Makefile.in modified: bchannel.c modified: chan_lcr.c modified: genext.c modified: gsm.cpp modified: gsm.h modified: gsm_conf.c modified: lcradmin.c modified: main.c modified: options.c modified: options.h --- gsm.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gsm.cpp') diff --git a/gsm.cpp b/gsm.cpp index b2bdd6b..b378df6 100644 --- a/gsm.cpp +++ b/gsm.cpp @@ -44,12 +44,9 @@ static struct timer_list db_sync_timer; #include "gsm_audio.h" -#undef AF_ISDN -#undef PF_ISDN -extern int AF_ISDN; -#define PF_ISDN AF_ISDN } +#include struct lcr_gsm *gsm = NULL; @@ -1607,6 +1604,8 @@ int gsm_init(void) char hlr[128], cfg[128], filename[128]; mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; int pcapfd, rc; + char conf_error[128] = ""; + debug_init(); tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc"); @@ -1632,8 +1631,8 @@ int gsm_init(void) gsm->gsm_sock = -1; /* parse options */ - if (!gsm_conf(&gsm->conf)) { - PERROR("%s", gsm_conf_error); + if (!gsm_conf(&gsm->conf, conf_error)) { + PERROR("%s", conf_error); return gsm_exit(-EINVAL); } -- cgit v1.2.3-55-g7522