Adding "fflush" to debug.log.

[lcr.git] / main.c

diff --git a/main.c b/main.c
index 98be1c0..6e91207 100644 (file)
--- a/main.c
+++ b/main.c
@@ -10,6 +10,9 @@
 \*****************************************************************************/ 
 
 #include "main.h"
+#ifdef PACKAGE_VERSION
+#undef PACKAGE_VERSION
+#endif
 #include "config.h"
 
 //MESSAGES
@@ -81,6 +84,7 @@ void debug(const char *function, int line, const char *prefix, char *buffer)
                                fprintf(debug_fp, "%s%s(in %s() line %d): %s", prefix?prefix:"", prefix?" ":"", function, line, buffer);
                        else
                                fprintf(debug_fp, "%s%s: %s", prefix?prefix:"", prefix?" ":"", buffer);
+                       fflush(debug_fp);
                }
        }
 
@@ -143,6 +147,8 @@ void sighandler(int sigset)
                return;
        if (sigset == SIGPIPE)
                return;
+       fprintf(stderr, "LCR: Signal received: %d\n", sigset);
+       PDEBUG(DEBUG_LOG, "Signal received: %d\n", sigset);
        if (!quit) {
                quit = sigset;
                /* set scheduler & priority */
@@ -151,8 +157,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);
        }
 }
 
@@ -162,7 +166,7 @@ void sighandler(int sigset)
  */
 int main(int argc, char *argv[])
 {
-#if defined WITH_GSM_BS || defined WITH_GSM_MS
+#if 0
        double                  now_d, last_d;
        int                     all_idle;
 #endif
@@ -364,25 +368,23 @@ int main(int argc, char *argv[])
        }
 
 #if defined WITH_GSM_BS || defined WITH_GSM_MS
-       /* handle gsm */
-       if (options.gsm && gsm_init()) {
+       /* init gsm */
+       if (gsm_init()) {
                fprintf(stderr, "GSM initialization failed.\n");
                goto free;
        }
-#else
-       if (options.gsm) {
-               fprintf(stderr, "GSM is enabled, but not compiled. Use --with-gsm-bs or --with-gsm-ms while configure!\n");
-               goto free;
-       }
 #endif
+#if 0
+init is done when interface is up
 #ifdef WITH_GSM_BS
-       if (options.gsm && gsm_bs_init()) {
+       if (gsm_bs_init()) {
                fprintf(stderr, "GSM BS initialization failed.\n");
                goto free;
        }
 #endif
+#endif
 #ifdef WITH_GSM_MS
-       if (options.gsm && gsm_ms_init()) {
+       if (gsm_ms_init()) {
                fprintf(stderr, "GSM MS initialization failed.\n");
                goto free;
        }
@@ -449,11 +451,11 @@ int main(int argc, char *argv[])
        printf("%s\n", tracetext);
        end_trace();
        quit = 0;
-#if defined WITH_GSM_BS || defined WITH_GSM_MS
+#if 0
        GET_NOW();
 #endif
        while(!quit) {
-#if defined WITH_GSM_BS || defined WITH_GSM_MS
+#if 0
                last_d = now_d;
                GET_NOW();
                if (now_d-last_d > 1.0) {
@@ -465,27 +467,14 @@ int main(int argc, char *argv[])
                /* must be processed after all queues, so they are empty */
                if (select_main(1, NULL, NULL, NULL))
                        all_idle = 0;
-               /* handle gsm */
-               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())
-                               all_idle = 0;
-#endif
-               }
                if (all_idle) {
                        usleep(10000);
                }
 #else
-               if (options.polling)
+               if (options.polling) {
                        if (!select_main(1, NULL, NULL, NULL))
                                usleep(10000);
-               else
+               } else
                        select_main(0, NULL, NULL, NULL);
 #endif
        }
@@ -590,17 +579,22 @@ free:
                mISDN_deinitialize();
 
        /* free gsm */
-       if (options.gsm) {
+#if 0
+exit is done when interface is down
 #ifdef WITH_GSM_BS
-               gsm_bs_exit(0);
+       gsm_bs_exit(0);
+#endif
 #endif
 #ifdef WITH_GSM_MS
-               gsm_ms_exit(0);
+       gsm_ms_exit(0);
 #endif
 #if defined WITH_GSM_BS || defined WITH_GSM_MS
-               gsm_exit(0);
+       gsm_exit(0);
 #endif
-       }
+
+       /* close loopback, if used by GSM or remote */
+       if (mISDNloop.sock > -1)
+               mISDNloop_close();
 
        /* display memory leak */
 #define MEMCHECK(a, b) \