projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[gsm] Make LCR work with current Osmocom-BB.
[lcr.git]
/
main.c
diff --git
a/main.c
b/main.c
index
b9e836c
..
1aa2d8b
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-11,6
+11,11
@@
#include "main.h"
#include "config.h"
#include "main.h"
#include "config.h"
+#ifdef WITH_GSM_MS
+extern "C" {
+#include <osmocore/signal.h>
+}
+#endif
//MESSAGES
//MESSAGES
@@
-138,11
+143,23
@@
void _printerror(const char *function, int line, const char *fmt, ...)
void sighandler(int sigset)
{
struct sched_param schedp;
void sighandler(int sigset)
{
struct sched_param schedp;
+#ifdef WITH_GSM_MS
+ int wait_ms = 0;
+#endif
if (sigset == SIGHUP)
return;
if (sigset == SIGPIPE)
return;
if (sigset == SIGHUP)
return;
if (sigset == SIGPIPE)
return;
+ fprintf(stderr, "LCR: Signal received: %d\n", sigset);
+ PDEBUG(DEBUG_LOG, "Signal received: %d\n", sigset);
+#ifdef WITH_GSM_MS
+ if (!wait_ms) {
+ wait_ms = 1;
+ dispatch_signal(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
+ return;
+ }
+#endif
if (!quit) {
quit = sigset;
/* set scheduler & priority */
if (!quit) {
quit = sigset;
/* set scheduler & priority */
@@
-151,8
+168,6
@@
void sighandler(int sigset)
schedp.sched_priority = 0;
sched_setscheduler(0, SCHED_OTHER, &schedp);
}
schedp.sched_priority = 0;
sched_setscheduler(0, SCHED_OTHER, &schedp);
}
- fprintf(stderr, "LCR: Signal received: %d\n", sigset);
- PDEBUG(DEBUG_LOG, "Signal received: %d\n", sigset);
}
}
}
}
@@
-470,7
+485,7
@@
int main(int argc, char *argv[])
if (handle_gsm())
all_idle = 0;
#ifdef WITH_GSM_MS
if (handle_gsm())
all_idle = 0;
#ifdef WITH_GSM_MS
- if (handle_gsm_ms())
+ if (handle_gsm_ms(
&quit
))
all_idle = 0;
#endif
}
all_idle = 0;
#endif
}