X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.c;h=51da4a133a403d7dd42b8e968166760a50962c44;hp=34812454c0d3f4139396887f9784cfbe6fcb898e;hb=b2f6c87b1b020e4ac30658422bb144ee3f05a842;hpb=59b8aa319440a9e58976cc921775889a27eb5347 diff --git a/main.c b/main.c index 3481245..51da4a1 100644 --- a/main.c +++ b/main.c @@ -9,21 +9,6 @@ ** ** \*****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "main.h" MESSAGES @@ -41,7 +26,7 @@ struct timezone now_tz; now_tm = localtime(&now); \ } -int global_debug = 0; +FILE *debug_fp = NULL; int quit=0; #if 0 @@ -49,8 +34,9 @@ struct lcr_fdset lcr_fdset[FD_SETSIZE]; #endif pthread_mutex_t mutexd; // debug output mutex -//pthread_mutex_t mutext; // trace output mutex +pthread_mutex_t mutext; // trace output mutex pthread_mutex_t mutexe; // error output mutex +//pthread_mutex_t mutex_lcr; // lcr process mutex int memuse = 0; int mmemuse = 0; @@ -63,18 +49,18 @@ int classuse = 0; int fduse = 0; int fhuse = 0; -char *debug_prefix = 0; +const char *debug_prefix = NULL; int debug_count = 0; int last_debug = 0; int debug_newline = 1; int nooutput = 0; -void debug_usleep(int msec, char *file, int line, int hour, int min, int sec) +void debug_usleep(int msec, const char *file, int line, int hour, int min, int sec) { usleep(msec); } -void debug(const char *function, int line, char *prefix, char *buffer) +void debug(const char *function, int line, const char *prefix, char *buffer) { /* if we have a new debug count, we add a mark */ if (last_debug != debug_count) @@ -82,8 +68,8 @@ void debug(const char *function, int line, char *prefix, char *buffer) last_debug = debug_count; if (!nooutput) printf("\033[34m--------------------- %04d.%02d.%02d %02d:%02d:%02d %06d\033[36m\n", now_tm->tm_year+1900, now_tm->tm_mon+1, now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec, debug_count%1000000); - if (options.deb&DEBUG_LOG && global_debug) - dprint(DBGM_MAN, 0, "--------------------- %04d.%02d.%02d %02d:%02d:%02d %06d\n", now_tm->tm_year+1900, now_tm->tm_mon+1, now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec, debug_count%1000000); + if (debug_fp) + fprintf(debug_fp, "--------------------- %04d.%02d.%02d %02d:%02d:%02d %06d\n", now_tm->tm_year+1900, now_tm->tm_mon+1, now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec, debug_count%1000000); } if (!nooutput) @@ -96,14 +82,14 @@ void debug(const char *function, int line, char *prefix, char *buffer) printf("%s", buffer); } - if (options.deb&DEBUG_LOG && global_debug) + if (debug_fp) { if (debug_newline) { if (function) - dprint(DBGM_MAN, 0, "%s%s(in %s() line %d): %s", prefix?prefix:"", prefix?" ":"", function, line, buffer); + fprintf(debug_fp, "%s%s(in %s() line %d): %s", prefix?prefix:"", prefix?" ":"", function, line, buffer); else - dprint(DBGM_MAN, 0, "%s%s: %s", prefix?prefix:"", prefix?" ":"", buffer); + fprintf(debug_fp, "%s%s: %s", prefix?prefix:"", prefix?" ":"", buffer); } } @@ -114,7 +100,7 @@ void debug(const char *function, int line, char *prefix, char *buffer) } -void _printdebug(const char *function, int line, unsigned long mask, const char *fmt, ...) +void _printdebug(const char *function, int line, unsigned int mask, const char *fmt, ...) { char buffer[4096]; va_list args; @@ -169,7 +155,7 @@ void sighandler(int sigset) return; if (!quit) { - quit=1; + quit = sigset; /* set scheduler & priority */ if (options.schedule > 1) { @@ -178,7 +164,7 @@ void sighandler(int sigset) sched_setscheduler(0, SCHED_OTHER, &schedp); } fprintf(stderr, "LCR: Signal received: %d\n", sigset); - PERROR("Signal received: %d\n", sigset); + PDEBUG(DEBUG_LOG, "Signal received: %d\n", sigset); } } @@ -190,7 +176,7 @@ int main(int argc, char *argv[]) { int ret = -1; int lockfd = -1; /* file lock */ - struct message *message; + struct lcr_msg *message; class Port *port; class Endpoint *epoint; class Join *join; @@ -198,17 +184,21 @@ int main(int argc, char *argv[]) int all_idle; char prefix_string[64]; struct sched_param schedp; - char *debug_prefix = "alloc"; + const char *debug_prefix = "alloc"; int created_mutexd = 0,/* created_mutext = 0,*/ created_mutexe = 0, - created_lock = 0, created_signal = 0, created_debug = 0; + created_lock = 0, created_signal = 0, created_debug = 0, + created_misdn = 0; int idletime = 0, idlecheck = 0; - char tracetext[256]; + char tracetext[256], lock[128]; #if 0 /* init fdset */ memset(lcr_fdset, 0, sizeof(lcr_fdset)); #endif + /* lock LCR process */ +// pthread_mutex_lock(&mutex_lcr); + /* current time */ GET_NOW(); @@ -236,13 +226,6 @@ int main(int argc, char *argv[]) /* init crc */ crc_init(); - /* check for root (real or effective) */ - if (getuid() && geteuid()) - { - fprintf(stderr, "Please run %s as super-user.\n", NAME); - goto free; - } - /* the mutex init */ if (pthread_mutex_init(&mutexd, NULL)) { @@ -285,18 +268,23 @@ int main(int argc, char *argv[]) /* query available isdn ports */ if (!(strcasecmp(argv[1],"query"))) { - mISDN_port_info(); + fprintf(stderr, "-> Using 'misdn_info'\n"); + system("misdn_info"); ret = 0; goto free; } /* read options */ if (read_options() == 0) + { + PERROR("%s", options_error); goto free; + } /* init mISDN */ if (mISDN_initialize() < 0) goto free; + created_misdn = 1; created_debug = 1; /* read ruleset(s) */ @@ -326,6 +314,7 @@ int main(int argc, char *argv[]) if (!(strcasecmp(argv[1],"fork"))) { pid_t pid; + FILE *pidfile; /* do daemon fork */ pid = fork(); @@ -356,6 +345,14 @@ int main(int argc, char *argv[]) exit(0); } nooutput = 1; + + /* write pid file */ + pidfile = fopen("/var/run/lcr.pid","w"); + if (pidfile) + { + fprintf(pidfile, "%d\n", getpid()); + fclose(pidfile); + } } else /* if not start */ if (!!strcasecmp(argv[1],"start")) @@ -364,9 +361,11 @@ int main(int argc, char *argv[]) } /* create lock and lock! */ - if ((lockfd = open("/var/run/lcr.lock", O_CREAT, 0)) < 0) + SPRINT(lock, "%s/lcr.lock", options.lock); + if ((lockfd = open(lock, O_CREAT | O_WRONLY, S_IWUSR)) < 0) { - fprintf(stderr, "Cannot create lock file: /var/run/lcr.lock\n"); + fprintf(stderr, "Cannot create lock file: %s\n", lock); + fprintf(stderr, "Check options.conf to change to path with permissions for you.\n"); goto free; } if (flock(lockfd, LOCK_EX|LOCK_NB) < 0) @@ -420,18 +419,17 @@ int main(int argc, char *argv[]) switch(errno) { case ENOMEM: - fprintf(stderr, "Not enough memory to lock paging, exitting...\n"); + fprintf(stderr, "Warning: Not enough memory to lock paging.\n"); break; case EPERM: - fprintf(stderr, "No permission to lock paging, exitting...\n"); + fprintf(stderr, "Warning: No permission to lock paging.\n"); break; case EFAULT: - fprintf(stderr, "'Bad address' while locking paging, exitting...\n"); + fprintf(stderr, "Warning: 'Bad address' while locking paging.\n"); break; default: - fprintf(stderr, "Unknown error %d while locking paging, exitting...\n", errno); + fprintf(stderr, "Warning: Unknown error %d while locking paging.\n", errno); } - goto free; } /* set real time scheduler & priority */ @@ -456,13 +454,14 @@ int main(int argc, char *argv[]) /*** main loop ***/ SPRINT(tracetext, "%s %s started, waiting for calls...", NAME, VERSION_STRING); - start_trace(0, NULL, NULL, NULL, 0, 0, 0, tracetext); + start_trace(-1, NULL, NULL, NULL, 0, 0, 0, tracetext); printf("%s\n", tracetext); end_trace(); GET_NOW(); quit = 0; while(!quit) { + last_d = now_d; GET_NOW(); if (now_d-last_d > 1.0) @@ -637,15 +636,17 @@ BUDETECT /* did we do nothing? so we wait to give time to other processes */ if (all_idle) { +// pthread_mutex_unlock(&mutex_lcr); // unlock LCR debug_usleep(4000, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec); +// pthread_mutex_lock(&mutex_lcr); // lock LCR idletime += 4000; } } SPRINT(tracetext, "%s terminated", NAME); printf("%s\n", tracetext); - start_trace(0, NULL, NULL, NULL, 0, 0, 0, tracetext); - if (ret) - add_trace("error", NULL, "%d", ret); + start_trace(-1, NULL, NULL, NULL, 0, 0, 0, tracetext); + if (quit) + add_trace((char *)"signal", NULL, "%d", quit); end_trace(); ret=0; @@ -658,7 +659,7 @@ free: if (options.schedule > 1) { memset(&schedp, 0, sizeof(schedp)); - schedp.sched_priority = 0; + schedp.sched_priority = options.schedule; sched_setscheduler(0, SCHED_OTHER, &schedp); } /* reset signals */ @@ -719,7 +720,11 @@ free: if (created_lock) flock(lockfd, LOCK_UN); if (lockfd >= 0) + { + chmod(lock, 0700); + unlink(lock); close(lockfd); + } /* free rulesets */ if (ruleset_first) @@ -738,15 +743,15 @@ free: fprintf(stderr, "cannot destroy 'PDEBUG' mutex\n"); /* deinitialize mISDN */ - mISDN_deinitialize(); - global_debug = 0; + if (created_misdn) + mISDN_deinitialize(); /* display memory leak */ #define MEMCHECK(a, b) \ if (b) \ { \ SPRINT(tracetext, a, NAME); \ - start_trace(0, NULL, NULL, NULL, 0, 0, 0, tracetext); \ + start_trace(-1, NULL, NULL, NULL, 0, 0, 0, tracetext); \ if (ret) add_trace("blocks", NULL, "%d", b); \ end_trace(); \ printf("\n******************************\n\007"); \ @@ -765,6 +770,9 @@ free: MEMCHECK("file descriptor(s) left",fduse) MEMCHECK("file handler(s) left",fhuse) + /* unlock LCR process */ +// pthread_mutex_unlock(&mutex_lcr); + /* take me out */ return(ret); } @@ -774,7 +782,7 @@ free: /* special debug function to detect buffer overflow */ int budetect_stop = 0; -void budetect(const char *file, int line, char *function) +void budetect(const char *file, int line, const char *function) { if (budetect_stop) return;