[gsm] Make LCR work with current Osmocom-BB.

[lcr.git] / main.c

diff --git a/main.c b/main.c
index c35be36..1aa2d8b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -10,6 +10,12 @@
 \*****************************************************************************/ 
 
 #include "main.h"
+#include "config.h"
+#ifdef WITH_GSM_MS
+extern "C" {
+#include <osmocore/signal.h>
+}
+#endif
 
 //MESSAGES
 
@@ -137,11 +143,23 @@ void _printerror(const char *function, int line, const char *fmt, ...)
 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;
+       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 */
@@ -150,8 +168,6 @@ void sighandler(int sigset)
                        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);
        }
 }
 
@@ -363,7 +379,7 @@ int main(int argc, char *argv[])
        }
 
 #if defined WITH_GSM_BS || defined WITH_GSM_MS
-       /* handle gsm */
+       /* init gsm */
        if (options.gsm && gsm_init()) {
                fprintf(stderr, "GSM initialization failed.\n");
                goto free;
@@ -468,12 +484,8 @@ int main(int argc, char *argv[])
                if (options.gsm) {
                        if (handle_gsm())
                                all_idle = 0;
-#ifdef WITH_GSM_BS
-                       if (handle_gsm_bs())
-                               all_idle = 0;
-#endif
 #ifdef WITH_GSM_MS
-                       if (handle_gsm_ms())
+                       if (handle_gsm_ms(&quit))
                                all_idle = 0;
 #endif
                }
@@ -601,6 +613,10 @@ free:
 #endif
        }
 
+       /* close loopback, if used by GSM or remote */
+       if (mISDNloop.sock > -1)
+               mISDNloop_close();
+
        /* display memory leak */
 #define MEMCHECK(a, b) \
        if (b) { \