projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed output problems of error messages while parsing options.conf / gsm.conf.
[lcr.git]
/
gsm.cpp
diff --git
a/gsm.cpp
b/gsm.cpp
index
b2bdd6b
..
b378df6
100644
(file)
--- a/
gsm.cpp
+++ b/
gsm.cpp
@@
-44,12
+44,9
@@
static struct timer_list db_sync_timer;
#include "gsm_audio.h"
#include "gsm_audio.h"
-#undef AF_ISDN
-#undef PF_ISDN
-extern int AF_ISDN;
-#define PF_ISDN AF_ISDN
}
}
+#include <mISDN/mISDNcompat.h>
struct lcr_gsm *gsm = NULL;
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 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");
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 */
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);
}
return gsm_exit(-EINVAL);
}