now_tm = localtime(&now); \
}
-#ifdef SOCKET_MISDN
FILE *debug_fp = NULL;
-#else
-int global_debug = 0;
-#endif
int quit=0;
#if 0
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);
-#ifdef SOCKET_MISDN
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);
-#else
- 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);
-#endif
}
if (!nooutput)
printf("%s", buffer);
}
-#ifdef SOCKET_MISDN
if (debug_fp)
-#else
- if (options.deb&DEBUG_LOG && global_debug)
-#endif
{
if (debug_newline)
{
if (function)
-#ifdef SOCKET_MISDN
fprintf(debug_fp, "%s%s(in %s() line %d): %s", prefix?prefix:"", prefix?" ":"", function, line, buffer);
-#else
- dprint(DBGM_MAN, 0, "%s%s(in %s() line %d): %s", prefix?prefix:"", prefix?" ":"", function, line, buffer);
-#endif
else
-#ifdef SOCKET_MISDN
fprintf(debug_fp, "%s%s: %s", prefix?prefix:"", prefix?" ":"", buffer);
-#else
- dprint(DBGM_MAN, 0, "%s%s: %s", prefix?prefix:"", prefix?" ":"", buffer);
-#endif
}
}
}
-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;
return;
if (!quit)
{
- quit=1;
+ quit = sigset;
/* set scheduler & priority */
if (options.schedule > 1)
{
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);
}
}
{
int ret = -1;
int lockfd = -1; /* file lock */
- struct message *message;
+ struct lcr_msg *message;
class Port *port;
class Endpoint *epoint;
class Join *join;
struct sched_param schedp;
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 */
/* 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))
{
/* query available isdn ports */
if (!(strcasecmp(argv[1],"query")))
{
- mISDN_port_info();
+ fprintf(stderr, "-> Using 'isdninfo'\n");
+ system("isdninfo");
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) */
}
/* 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)) < 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)
switch(errno)
{
case ENOMEM:
- fprintf(stderr, "Not enough memory to lock paging, exitting...\n");
+ fprintf(stderr, "Warning: Not enough memory to lock paging, exitting...\n");
break;
case EPERM:
- fprintf(stderr, "No permission to lock paging, exitting...\n");
+ fprintf(stderr, "Warning: No permission to lock paging, exitting...\n");
break;
case EFAULT:
- fprintf(stderr, "'Bad address' while locking paging, exitting...\n");
+ fprintf(stderr, "Warning: 'Bad address' while locking paging, exitting...\n");
break;
default:
- fprintf(stderr, "Unknown error %d while locking paging, exitting...\n", errno);
+ fprintf(stderr, "Warning: Unknown error %d while locking paging, exitting...\n", errno);
}
- goto free;
}
/* set real time scheduler & priority */
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);
+ if (quit)
+ add_trace("signal", NULL, "%d", quit);
end_trace();
ret=0;
if (created_lock)
flock(lockfd, LOCK_UN);
if (lockfd >= 0)
+ {
+ chmod(lock, 0700);
+ unlink(lock);
close(lockfd);
+ }
/* free rulesets */
if (ruleset_first)
fprintf(stderr, "cannot destroy 'PDEBUG' mutex\n");
/* deinitialize mISDN */
- mISDN_deinitialize();
+ if (created_misdn)
+ mISDN_deinitialize();
/* display memory leak */
#define MEMCHECK(a, b) \