X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.c;h=8d06aea9240b20497f1dacbb8718075ed29c7e4a;hp=12e43b86526a833cb8edfe43ac5ce066ca318b9b;hb=cf1ea15cc320019d7b41eb56aeeb3c1956fbb7a0;hpb=2ed0fee489c37a6e2d4473f6185ebbe3e746ac11

diff --git a/main.c b/main.c
index 12e43b8..8d06aea 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
 /*****************************************************************************\
 **                                                                           **
-** PBX4Linux                                                                 **
+** Linux Call Router                                                         **
 **                                                                           **
 **---------------------------------------------------------------------------**
 ** Copyright: Andreas Eversberg                                              **
@@ -9,26 +9,11 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/file.h>
-#include <errno.h>
-#include <sys/mman.h>
-#include <sys/resource.h>
 #include "main.h"
 
 MESSAGES
 
-double now_d;
+double now_d, last_d;
 time_t now;
 struct tm *now_tm;
 struct timeval now_tv;
@@ -40,47 +25,18 @@ struct timezone now_tz;
 		now = now_tv.tv_sec; \
 		now_tm = localtime(&now); \
 	}
-//#define DEBUG_DURATION
 
-int global_debug = 0;
+FILE *debug_fp = NULL;
 int quit=0;
 
-pthread_mutex_t mutexd; // debug output mutex
-pthread_mutex_t mutexl; // log output mutex
-pthread_mutex_t mutexe; // error output mutex
-
-#ifdef H323
-PMutex mutex_h323; // mutual exclude threads when using OpenH323
-#endif
-
-#ifdef VOIP
-class PBXMain : public PProcess
-{
-	PCLASSINFO(PBXMain, PProcess)
-  public:
-	PBXMain(void);
-	~PBXMain(void);
-	void Main();
-};
-
-PCREATE_PROCESS(PBXMain)
-
-PBXMain::PBXMain(void) : PProcess("Jolly", "LinuxPBX", 0, 1, AlphaCode, 1)
-{
-}
-
-PBXMain::~PBXMain(void)
-{
-}
-#endif
-
-#ifdef H323
-H323_ep *h323_ep = NULL;
-#endif
-#ifdef OPAL
-OpalManager *opal_mgr = NULL;
+#if 0
+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 mutexe; // error output mutex
+//pthread_mutex_t mutex_lcr; // lcr process mutex
 
 int memuse = 0;
 int mmemuse = 0;
@@ -93,26 +49,29 @@ 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;
 
-static void debug(const char *function, int line, char *prefix, char *buffer)
+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, const char *prefix, char *buffer)
 {
 	/* if we have a new debug count, we add a mark */
-	if (last_debug != debug_count)
-	{
+	if (last_debug != debug_count) {
 		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)
-	{
+	if (!nooutput) {
 		if (debug_newline)
 			printf("\033[32m%06d %s\033[37m%s", debug_count%1000000, prefix?prefix:"", prefix?" ":"");
 		if (function)
@@ -121,14 +80,12 @@ static void debug(const char *function, int line, char *prefix, char *buffer)
 			printf("%s", buffer);
 	}
 
-	if (options.deb&DEBUG_LOG && global_debug)
-	{
-		if (debug_newline)
-		{
+	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);
 		}
 	}
 
@@ -138,37 +95,8 @@ static void debug(const char *function, int line, char *prefix, char *buffer)
 			debug_newline = 1;
 }
 
-void printlog(const char *fmt, ...)
-{
-	char buffer[4096];
-	va_list args;
-	FILE *fp;
 
-	pthread_mutex_lock(&mutexl);
-
-	va_start(args,fmt);
-	VUNPRINT(buffer,sizeof(buffer)-1,fmt,args);
-	buffer[sizeof(buffer)-1]=0;
-	va_end(args);
-
-	if (options.log[0])
-	{
-		if (options.deb & DEBUG_LOG)
-			debug(NULL, 0, "LOG ->", buffer);
-
-		if ((fp = fopen(options.log, "a")))
-		{
-			fduse++;
-			fprintf(fp, "%04d.%02d.%02d %02d:%02d:%02d %s", 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, buffer);
-			fclose(fp);
-			fduse--;
-		}
-	}
-
-	pthread_mutex_unlock(&mutexl);
-}
-
-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;
@@ -201,8 +129,7 @@ void _printerror(const char *function, int line, const char *fmt, ...)
 
 	if (options.deb)
 		debug(function, line, "ERROR", buffer);
-	else /* only if we do not debug */
-	{
+	else { /* only if we do not debug */
 		if (function)
 			fprintf(stderr, "ERROR (in %s() line %d) %s", function, line, buffer);
 		else
@@ -221,18 +148,16 @@ void sighandler(int sigset)
 		return;
 	if (sigset == SIGPIPE)
 		return;
-	if (!quit)
-	{
-		quit=1;
+	if (!quit) {
+		quit = sigset;
 		/* set scheduler & priority */
-		if (options.schedule > 1)
-		{
+		if (options.schedule > 1) {
 			memset(&schedp, 0, sizeof(schedp));
 			schedp.sched_priority = 0;
 			sched_setscheduler(0, SCHED_OTHER, &schedp);
 		}
-		fprintf(stderr, "PBX: Signal received: %d\n", sigset);
-		PERROR("Signal received: %d\n", sigset);
+		fprintf(stderr, "LCR: Signal received: %d\n", sigset);
+		PDEBUG(DEBUG_LOG, "Signal received: %d\n", sigset);
 	}
 }
 
@@ -240,163 +165,120 @@ void sighandler(int sigset)
 /*
  * the main
  */
-#ifdef VOIP
-#define ARGC (args.GetCount()+1)
-#define ARGV(a) (args[a-1])
-void PBXMain::Main(void)
-{
-	PArgList &args = GetArguments();
-#else
-#define ARGC (argc)
-#define ARGV(a) (argv[a])
 int main(int argc, char *argv[])
 {
-#endif
 	int			ret = -1;
 	int			lockfd = -1; /* file lock */
-	struct message		*message;
+	struct lcr_msg		*message;
 	class Port		*port;
 	class Endpoint		*epoint;
-	class Call		*call;
+	class Join		*join;
 	int			i;
 	int			all_idle;
 	char			prefix_string[64];
 	struct sched_param	schedp;
-	char 			*debug_prefix = "alloc";
-	int			created_mutexd = 0, created_mutexl = 0, created_mutexe = 0,
-        			created_lock = 0, created_signal = 0, created_debug = 0;
-#ifdef DEBUG_DURATION
-	time_t			durationupdate;
-	double			idle_duration, isdn_duration, port_duration, epoint_duration, call_duration, message_duration, admin_duration;
-	double			start_d;
-#endif
+	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_misdn = 0;
 	int			idletime = 0, idlecheck = 0;
-	char			debug_log[128];
+	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();
 
 	/* show version */
-#ifdef OPAL
-	printf("\n** %s  Version %s (with OPAL)\n\n", NAME, VERSION_STRING);
-#else
- #ifdef H323
-	printf("\n** %s  Version %s (with H323)\n\n", NAME, VERSION_STRING);
- #else
 	printf("\n** %s  Version %s\n\n", NAME, VERSION_STRING);
- #endif
-#endif
 
 	/* show options */
-	if (ARGC <= 1)
-	{
+	if (argc <= 1) {
 		usage:
 		printf("\n");
-		printf("Usage: pbx (query | start | fork | rules | route)\n");
+		printf("Usage: lcr (query | start | fork | rules | route)\n");
 		printf("query     = Show available isdn ports.\n");
-		printf("start     = Run pbx normally, abort with CTRL+C.\n");
+		printf("start     = Run lcr normally, abort with CTRL+C.\n");
 		printf("fork      = Do daemon fork and run as background process.\n");
 		printf("interface = Get help of available interface syntax.\n");
 		printf("rules     = Get help of available routing rule syntax.\n");
 		printf("rules [action] = Get individual help for given action.\n");
 //		printf("route = Show current routing as it is parsed.\n");
 		printf("\n");
-		ret = 0;
-		goto free;
-	}
-
-	/* check if we have a jitter limit that makes sense */
-	if (ISDN_JITTERLIMIT < 256)
-	{
-		fprintf(stderr, "The ISDN_JITTERLIMIT must be at least 256 samples.\n");
+		ret = 999;
 		goto free;
 	}
 
 	/* 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))
-	{
+	if (pthread_mutex_init(&mutexd, NULL)) {
 		fprintf(stderr, "cannot create 'PDEBUG' mutex\n");
 		goto free;
 	}
 	created_mutexd = 1;
-	if (pthread_mutex_init(&mutexl, NULL))
-	{
-		fprintf(stderr, "cannot create 'printlog' mutex\n");
-		goto free;
-	}
-	created_mutexl = 1;
-	if (pthread_mutex_init(&mutexe, NULL))
-	{
+//	if (pthread_mutex_init(&mutext, NULL)) {
+//		fprintf(stderr, "cannot create 'trace' mutex\n");
+//		goto free;
+//	}
+//	created_mutext = 1;
+	if (pthread_mutex_init(&mutexe, NULL)) {
 		fprintf(stderr, "cannot create 'PERROR' mutex\n");
 		goto free;
 	}
 	created_mutexe = 1;
 
 	/* show interface */
-	if (!(strcasecmp(ARGV(1),"interface")))
-	{
+	if (!(strcasecmp(argv[1],"interface"))) {
 		doc_interface();
 		ret = 0;
 		goto free;
 	}
 
 	/* show rules */
-	if (!(strcasecmp(ARGV(1),"rules")))
-	{
-		if (ARGC <= 2)
+	if (!(strcasecmp(argv[1],"rules"))) {
+		if (argc <= 2)
 			doc_rules(NULL);
 		else
-			doc_rules(ARGV(2));
+			doc_rules(argv[2]);
 		ret = 0;
 		goto free;
 	}
 
 	/* query available isdn ports */
-	if (!(strcasecmp(ARGV(1),"query")))
-	{
-		mISDN_port_info();
+	if (!(strcasecmp(argv[1],"query"))) {
+		fprintf(stderr, "-> Using 'misdn_info'\n");
+		system("misdn_info");
 		ret = 0;
 		goto free;
 	}
 
 	/* read options */
-	if (read_options() == 0)
+	if (read_options() == 0) {
+		PERROR("%s", options_error);
 		goto free;
+	}
 
-	/* initialize stuff of the NT lib */
-	if (options.deb & DEBUG_STACK)
-	{
-		global_debug = 0xffffffff & ~DBGM_MSG;
-//		global_debug = DBGM_L3DATA;
-	} else
-		global_debug = DBGM_MAN;
-	SPRINT(debug_log, "%s/debug.log", INSTALL_DATA);
-	if (options.deb & DEBUG_LOG)
-		debug_init(global_debug, debug_log, debug_log, debug_log);
-	else
-		debug_init(global_debug, NULL, NULL, NULL);
+	/* init mISDN */
+	if (mISDN_initialize() < 0)
+		goto free;
+	created_misdn = 1;
 	created_debug = 1;
 
-	msg_init();
-
 	/* read ruleset(s) */
 	if (!(ruleset_first = ruleset_parse()))
 		goto free;
 
 	/* set pointer to main ruleset */
 	ruleset_main = getrulesetbyname("main");
-	if (!ruleset_main)
-	{
+	if (!ruleset_main) {
 		fprintf(stderr, "\n***\n -> Missing 'main' ruleset, causing ALL calls to be disconnected.\n***\n\n");
 		PDEBUG(DEBUG_LOG, "Missing 'main' ruleset, causing ALL calls to be disconnected.\n");
 		sleep(2);
@@ -404,8 +286,7 @@ int main(int argc, char *argv[])
 
 #if 0
 	/* query available isdn ports */
-	if (!(strcasecmp(ARGV(1),"route")))
-	{
+	if (!(strcasecmp(argv[1],"route"))) {
 		ruleset_debug(ruleset_first);
 		ret = 0;
 		goto free;
@@ -413,20 +294,18 @@ int main(int argc, char *argv[])
 #endif
 
 	/* do fork in special cases */
-	if (!(strcasecmp(ARGV(1),"fork")))
-	{
+	if (!(strcasecmp(argv[1],"fork"))) {
 		pid_t pid;
+		FILE *pidfile;
 
 		/* do daemon fork */
 		pid = fork();
 
-		if (pid < 0)
-		{
+		if (pid < 0) {
 			fprintf(stderr, "Cannot fork!\n");
 			goto free;
 		}
-		if (pid != 0)
-		{
+		if (pid != 0) {
 			exit(0);
 		}
 		usleep(200000);
@@ -435,42 +314,45 @@ int main(int argc, char *argv[])
 		/* do second fork */
 		pid = fork();
 
-		if (pid < 0)
-		{
+		if (pid < 0) {
 			fprintf(stderr, "Cannot fork!\n");
 			goto free;
 		}
-		if (pid != 0)
-		{
-			printf("PBX: Starting daemon.\n");
+		if (pid != 0) {
+			printf("LCR: Starting daemon.\n");
 			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"))
-	{
+	if (!!strcasecmp(argv[1],"start")) {
 		goto usage;
 	}
 
 	/* create lock and lock! */
-	if ((lockfd = open("/var/run/pbx.lock", O_CREAT, 0)) < 0)
-	{
-		fprintf(stderr, "Cannot create lock file: /var/run/pbx.lock\n");
+	SPRINT(lock, "%s/lcr.lock", options.lock);
+	if ((lockfd = open(lock, O_CREAT | O_WRONLY, S_IWUSR)) < 0) {
+		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)
-	{
+	if (flock(lockfd, LOCK_EX|LOCK_NB) < 0) {
 		if (errno == EWOULDBLOCK)
-			fprintf(stderr, "PBX: Another PBX process is running. Please kill the other one.\n");
+			fprintf(stderr, "LCR: Another LCR process is running. Please kill the other one.\n");
 		else	fprintf(stderr, "Locking process failed: errno=%d\n", errno);
 		goto free;
 	}
 	created_lock = 1;
 
 	/* initialize admin socket */
-	if (admin_init())
-	{
+	if (admin_init()) {
 		fprintf(stderr, "Unable to initialize admin socket.\n");
 		goto free;
 	}
@@ -479,93 +361,64 @@ int main(int argc, char *argv[])
 	generate_tables(options.law);
 
 	/* load tones (if requested) */
-	if (fetch_tones() == 0)
-	{
+	if (fetch_tones() == 0) {
 		fprintf(stderr, "Unable to fetch tones into memory.\n");
 		goto free;
 	}
 
-#ifdef OPAL
-	/* create OPAL manager */
-	opal_mgr = new PBXManager;
-	if (!opal_mgr)
-	{
-		fprintf(stderr, "Unable to create OPAL manager.\n");
-		goto free;
-	}
-	if (opal_mgr->Initialise())
-	{
-		todo thread kreieren...
-		opal_mgr->Main();
-	}
-
-#endif
-
-	
-#ifdef H323
-	// create h323 endpoint and initialize
-	h323_ep = new H323_ep();
-	if (!h323_ep)
-	{
-		fprintf(stderr, "Unable to create h323 endpoint.\n");
+#ifdef WITH_GSM
+	/* handle gsm */
+	if (options.gsm && gsm_init()) {
+		fprintf(stderr, "GSM initialization failed.\n");
 		goto free;
 	}
-	if (h323_ep->Init() == FALSE)
-	{
-		fprintf(stderr, "Unable to init h323 endpoint.\n");
+#else
+	if (options.gsm) {
+		fprintf(stderr, "GSM is enabled, but not compiled. Use --with-gsm while configure!\n");
 		goto free;
 	}
-
 #endif
 
 	/* read interfaces and open ports */
-	if (!read_interfaces())
-	{
+	if (!read_interfaces()) {
 		PERROR_RUNTIME("No interfaces specified or failed to parse interface.conf.\n");
 		fprintf(stderr, "No interfaces specified or failed to parse interface.conf.\n");
 		goto free;
 	}
 	relink_interfaces();
 	interface_first = interface_newlist;
-	free_interfaces(interface_newlist);
 	interface_newlist = NULL;
 	
 	/* locking memory paging */
 	i = 0;
-	while(i < 10)
-	{
+	while(i < 10) {
 		if (mlockall(MCL_CURRENT | MCL_FUTURE) >= 0)
 			break;
 		usleep(200000);
 		i++;
 	}
-	if (i == 10)
-	{
-		switch(errno)
-		{
+	if (i == 10) {
+		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 */
-	if (options.schedule > 1)
-	{
+	if (options.schedule > 1) {
 		memset(&schedp, 0, sizeof(schedp));
 		schedp.sched_priority = options.schedule;
 		ret = sched_setscheduler(0, SCHED_RR, &schedp);
-		if (ret < 0)
-		{
+		if (ret < 0) {
 			PERROR("Scheduling failed with given priority %d (errno = %d).\nCheck options.conf 'schedule', exitting...\n", options.schedule, errno);
 			goto free;
 		}
@@ -579,40 +432,38 @@ int main(int argc, char *argv[])
 	created_signal = 1;
 
 	/*** main loop ***/
-	printf("%s %s started, waiting for calls...\n", NAME, VERSION_STRING);
-	printlog("%s %s started, waiting for calls...\n", NAME, VERSION_STRING);
+	SPRINT(tracetext, "%s %s started, waiting for calls...", NAME, VERSION_STRING);
+	start_trace(-1, NULL, NULL, NULL, 0, 0, 0, tracetext);
+	printf("%s\n", tracetext);
+	end_trace();
 	GET_NOW();
-#ifdef DEBUG_DURATION
-	start_d = now_d;
-	durationupdate = now;
-	idle_duration = isdn_duration = port_duration = epoint_duration = call_duration = message_duration = admin_duration = 0;
-#endif
 	quit = 0;
-	while(!quit)
-	{
+	while(!quit) {
+
+		last_d = now_d;
+		GET_NOW();
+		if (now_d-last_d > 1.0) {
+			PERROR("LCR was stalling %d.%d seconds\n", ((int)((now_d-last_d)*10.0))/10, (int)((now_d-last_d)*10.0));
+		}
 		/* all loops must be counted from the beginning since nodes might get freed during handler */
-#ifdef H323
-		mutex_h323.Wait();
-		debug_prefix = 0;
-#endif
 		all_idle = 1;
 
+//#warning debugging usleep crash
+//		debug_usleep(1, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec);
+
 		/* handle mISDN messages from kernel */
 		debug_prefix = "ISDN";
 		if (mISDN_handler())
 			all_idle = 0;
-#ifdef DEBUG_DURATION
-		GET_NOW();
-		isdn_duration += (now_d - start_d);
-		start_d = now_d;
-#endif
+//#warning debugging usleep crash
+//		debug_usleep(1, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec);
+
 BUDETECT
 
 		/* loop through all port ports and call their handler */
 		port_again:
 		port = port_first;
-		while(port)
-		{
+		while(port) {
 			debug_prefix = port->p_name;
 			debug_count++;
 			ret = port->handler();
@@ -622,17 +473,11 @@ BUDETECT
 				goto port_again;
 			port = port->next;
 		}
-#ifdef DEBUG_DURATION
-		GET_NOW();
-		port_duration += (now_d - start_d);
-		start_d = now_d;
-#endif
 
 		/* loop through all epoint and call their handler */
 		epoint_again:
 		epoint = epoint_first;
-		while(epoint)
-		{
+		while(epoint) {
 			debug_prefix = prefix_string;
 			SPRINT(prefix_string, "ep%ld", epoint->ep_serial);
 			debug_count++;
@@ -643,99 +488,74 @@ BUDETECT
 				goto epoint_again;
 			epoint = epoint->next;
 		}
-#ifdef DEBUG_DURATION
-		GET_NOW();
-		epoint_duration += (now_d - start_d);
-		start_d = now_d;
-#endif
 
-		/* loop through all calls and call their handler */
-		call_again:
-		call = call_first;
-		while(call)
-		{
-			debug_prefix = "call";
+		/* loop through all joins and call their handler */
+		join_again:
+		join = join_first;
+		while(join) {
+			debug_prefix = "join";
 			debug_count++;
-			ret = call->handler();
+			ret = join->handler();
 			if (ret)
 				all_idle = 0;
-			if (ret < 0) /* call has been destroyed */
-				goto call_again;
-			call = call->next;
+			if (ret < 0) /* join has been destroyed */
+				goto join_again;
+			join = join->next;
 		}
-#ifdef DEBUG_DURATION
-		GET_NOW();
-		call_duration += (now_d - start_d);
-		start_d = now_d;
-#endif
 
 		debug_prefix = 0;
 
 		/* process any message */
 		debug_count++;
 		debug_prefix = "message";
-		while ((message = message_get()))
-		{
+		while ((message = message_get())) {
 			all_idle = 0;
-			switch(message->flow)
-			{
+			switch(message->flow) {
 				case PORT_TO_EPOINT:
 				debug_prefix = "msg port->epoint";
 				epoint = find_epoint_id(message->id_to);
-				if (epoint)
-				{
-					if (epoint->ep_app)
-					{
+				if (epoint) {
+					if (epoint->ep_app) {
 						epoint->ep_app->ea_message_port(message->id_from, message->type, &message->param);
-					} else
-					{
+					} else {
 						PDEBUG(DEBUG_MSG, "Warning: message %s from port %d to endpoint %d. endpoint doesn't have an application.\n", messages_txt[message->type], message->id_from, message->id_to);
 					}
-				} else
-				{
+				} else {
 					PDEBUG(DEBUG_MSG, "Warning: message %s from port %d to endpoint %d. endpoint doesn't exist anymore.\n", messages_txt[message->type], message->id_from, message->id_to);
 				}
 				break;
 
-				case EPOINT_TO_CALL:
-				debug_prefix = "msg epoint->call";
-				call = find_call_id(message->id_to);
-				if (call)
-				{
-					call->message_epoint(message->id_from, message->type, &message->param);
-				} else
-				{
-					PDEBUG(DEBUG_MSG, "Warning: message %s from endpoint %d to call %d. call doesn't exist anymore\n", messages_txt[message->type], message->id_from, message->id_to);
+				case EPOINT_TO_JOIN:
+				debug_prefix = "msg epoint->join";
+				join = find_join_id(message->id_to);
+				if (join) {
+					join->message_epoint(message->id_from, message->type, &message->param);
+				} else {
+					PDEBUG(DEBUG_MSG, "Warning: message %s from endpoint %d to join %d. join doesn't exist anymore\n", messages_txt[message->type], message->id_from, message->id_to);
 				}
 				break;
 
-				case CALL_TO_EPOINT:
-				debug_prefix = "msg call->epoint";
+				case JOIN_TO_EPOINT:
+				debug_prefix = "msg join->epoint";
 				epoint = find_epoint_id(message->id_to);
-				if (epoint)
-				{
-					if (epoint->ep_app)
-					{
-						epoint->ep_app->ea_message_call(message->id_from, message->type, &message->param);
-					} else
-					{
-						PDEBUG(DEBUG_MSG, "Warning: message %s from call %d to endpoint %d. endpoint doesn't have an application.\n", messages_txt[message->type], message->id_from, message->id_to);
+				if (epoint) {
+					if (epoint->ep_app) {
+						epoint->ep_app->ea_message_join(message->id_from, message->type, &message->param);
+					} else {
+						PDEBUG(DEBUG_MSG, "Warning: message %s from join %d to endpoint %d. endpoint doesn't have an application.\n", messages_txt[message->type], message->id_from, message->id_to);
 					}
-				} else
-				{
-					PDEBUG(DEBUG_MSG, "Warning: message %s from call %d to endpoint %d. endpoint doesn't exist anymore.\n", messages_txt[message->type], message->id_from, message->id_to);
+				} else {
+					PDEBUG(DEBUG_MSG, "Warning: message %s from join %d to endpoint %d. endpoint doesn't exist anymore.\n", messages_txt[message->type], message->id_from, message->id_to);
 				}
 				break;
 
 				case EPOINT_TO_PORT:
 				debug_prefix = "msg epoint->port";
 				port = find_port_id(message->id_to);
-				if (port)
-				{
+				if (port) {
 					port->message_epoint(message->id_from, message->type, &message->param);
 BUDETECT
-				} else
-				{
+				} else {
 					PDEBUG(DEBUG_MSG, "Warning: message %s from endpoint %d to port %d. port doesn't exist anymore\n", messages_txt[message->type], message->id_from, message->id_to);
 				}
 				break;
@@ -747,74 +567,53 @@ BUDETECT
 			debug_count++;
 			debug_prefix = "message";
 		}
-#ifdef DEBUG_DURATION
-		GET_NOW();
-		message_duration += (now_d - start_d);
-		start_d = now_d;
-#endif
 BUDETECT
 
 		/* handle socket */
 		if (admin_handle())
 			all_idle = 0;
-#ifdef DEBUG_DURATION
-		GET_NOW();
-		admin_duration += (now_d - start_d);
-		start_d = now_d;
+BUDETECT
+
+#ifdef WITH_GSM
+		/* handle gsm */
+		if (options.gsm)
+			while(handle_gsm())
+				all_idle = 0;
 #endif
+
 BUDETECT
 
 #if 0
 		/* check for child to exit (eliminate zombies) */
-		if (waitpid(-1, NULL, WNOHANG) > 0)
-		{
+		if (waitpid(-1, NULL, WNOHANG) > 0) {
 			PDEBUG(DEBUG_EPOINT, "a child process (created by endpoint) has exitted.\n");
 			all_idle = 0;
 		}
 #endif
+//#warning debugging usleep crash
+//		debug_usleep(1, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec);
 
 		/* do idle checking */
-		if (idlecheck != now)
-		{
+		if (idlecheck != now) {
 			PDEBUG(DEBUG_IDLETIME, "Idle time : %d%%\n", idletime/10000);
 			idletime = 0;
 			idlecheck = now;
 		}
-#ifdef DEBUG_DURATION
-		GET_NOW();
-		idle_duration += (now_d - start_d);
-		start_d = now_d;
-		if (durationupdate != now)
-		{
-			durationupdate = now;
-			printf("Idle:%3d ISDN:%3d Port:%3d Epoint:%3d Call:%3d Message:%3d Admin:%3d\n",
-				(int)(idle_duration*100),
-				(int)(isdn_duration*100),
-				(int)(port_duration*100),
-				(int)(epoint_duration*100),
-				(int)(call_duration*100),
-				(int)(message_duration*100),
-				(int)(admin_duration*100));
-			idle_duration = isdn_duration = port_duration = epoint_duration = call_duration = message_duration = admin_duration = 0;
-		}
-#else
-		GET_NOW();
-#endif
-
-#ifdef H323
-		// NOTE: be carefull with this, don't do anything after unlocking except sleeping and locking!
-		debug_prefix = "h323";
-		mutex_h323.Signal();
-#endif
 
 		/* did we do nothing? so we wait to give time to other processes */
-		if (all_idle)
-		{
-			usleep(4000); /* wait 32 samples */
+		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;
 		}
 	}
-	printlog("PBX terminated\n");
+	SPRINT(tracetext, "%s terminated", NAME);
+	printf("%s\n", tracetext);
+	start_trace(-1, NULL, NULL, NULL, 0, 0, 0, tracetext);
+	if (quit)
+		add_trace((char *)"signal", NULL, "%d", quit);
+	end_trace();
 	ret=0;
 
 	/* free all */
@@ -822,17 +621,14 @@ free:
 
 
 	/* set scheduler & priority
-	 * we must remove realtimeshed, because h323 may lock during exit
 	 */
-	if (options.schedule > 1)
-	{
+	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 */
-	if (created_signal)
-	{
+	if (created_signal) {
 		signal(SIGINT,SIG_DFL);
 		signal(SIGHUP,SIG_DFL);
 		signal(SIGTERM,SIG_DFL);
@@ -840,24 +636,19 @@ free:
 	}
 
 	/* destroy objects */
-#ifdef H323
-	mutex_h323.Wait();
-#endif
 	debug_prefix = "free";
 
-	while(port_first)
-	{
+	while(port_first) {
 		debug_count++;
 		delete port_first;
 	}
-	while(epoint_first)
-	{
+	while(epoint_first) {
 		debug_count++;
 		delete epoint_first;
 	}
 	epoint_first = NULL;
 	debug_count++;
-	call_free();
+	join_free();
 
 	/* free interfaces */
 	if (interface_first)
@@ -870,47 +661,14 @@ free:
 	/* flush messages */
 	debug_count++;
 	i = 0;
-	while ((message = message_get()))
-	{
+	while ((message = message_get())) {
 		i++;
 		message_free(message);
 	}
-	if (i)
-	{
+	if (i) {
 		PDEBUG(DEBUG_MSG, "freed %d pending messages\n", i);
 	}
 
-#ifdef H323
-	mutex_h323.Signal();
-#endif
-
-#ifdef OPAL
-	/* destroy manager */
-	if (opal_mgr)
-	{
-		todo kill an den main-thread von opal und warten...
-		if (options.deb & DEBUG_OPAL)
-			printf("->now deleting opal manager\n");
-		delete opal_mgr;
-		if (options.deb & DEBUG_OPAL)
-			printf("->opal manager deleted\n");
-	}
-
-#endif
-
-#ifdef H323
-	/* destroy endpoint */
-	if (h323_ep)
-	{
-		if (options.deb & DEBUG_H323)
-			printf("->now deleting endpoint\n");
-		delete h323_ep;
-		if (options.deb & DEBUG_H323)
-			printf("->endpoint deleted\n");
-	}
-
-#endif
-
 	/* free tones */
 	if (toneset_first)
 		free_tones();
@@ -921,8 +679,11 @@ free:
 	/* close lock */
 	if (created_lock)
 		flock(lockfd, LOCK_UN);
-	if (lockfd >= 0)
+	if (lockfd >= 0) {
+		chmod(lock, 0700);
+		unlink(lock);
 		close(lockfd);
+	}
 
 	/* free rulesets */
 	if (ruleset_first)
@@ -933,31 +694,39 @@ free:
 	if (created_mutexe)
 		if (pthread_mutex_destroy(&mutexe))
 			fprintf(stderr, "cannot destroy 'PERROR' mutex\n");
-	if (created_mutexl)
-		if (pthread_mutex_destroy(&mutexl))
-			fprintf(stderr, "cannot destroy 'printlog' mutex\n");
+//	if (created_mutext)
+//		if (pthread_mutex_destroy(&mutext))
+//			fprintf(stderr, "cannot destroy 'trace' mutex\n");
 	if (created_mutexd)
 		if (pthread_mutex_destroy(&mutexd))
 			fprintf(stderr, "cannot destroy 'PDEBUG' mutex\n");
 
-	/* close debug */
-	if (created_debug)
-		debug_close();
-	global_debug = 0;
+	/* deinitialize mISDN */
+	if (created_misdn)
+		mISDN_deinitialize();
+
+#ifdef WITH_GSM
+	/* free gsm */
+	if (options.gsm)
+		gsm_exit(0);
+#endif
 
 	/* display memory leak */
 #define MEMCHECK(a, b) \
-	if (b) \
-	{ \
+	if (b) { \
+		SPRINT(tracetext, a, NAME); \
+		start_trace(-1, NULL, NULL, NULL, 0, 0, 0, tracetext); \
+		if (ret) add_trace("blocks", NULL, "%d", b); \
+		end_trace(); \
 		printf("\n******************************\n\007"); \
 		printf("\nERROR: %d %s\n", b, a); \
 		printf("\n******************************\n"); \
 		ret = -1; \
 	}
 	MEMCHECK("",memuse)
-	MEMCHECK("memory block(s) left (port.cpp)",pmemuse)
-	MEMCHECK("memory block(s) left (epoint.cpp)",ememuse)
-	MEMCHECK("memory block(s) left (call.cpp)",cmemuse)
+	MEMCHECK("memory block(s) left (port.cpp ...)",pmemuse)
+	MEMCHECK("memory block(s) left (epoint*.cpp ...)",ememuse)
+	MEMCHECK("memory block(s) left (join*.cpp)",cmemuse)
 	MEMCHECK("memory block(s) left (message.c)",mmemuse)
 	MEMCHECK("memory block(s) left (route.c)",rmemuse)
 	MEMCHECK("memory block(s) left (args)",amemuse)
@@ -965,14 +734,11 @@ free:
 	MEMCHECK("file descriptor(s) left",fduse)
 	MEMCHECK("file handler(s) left",fhuse)
 
+	/* unlock LCR process */
+//	pthread_mutex_unlock(&mutex_lcr);
+
 	/* take me out */
-	if (ret)
-		printf("PBX: Exit (code %d)\n", ret);
-#ifdef VOIP
-	return;
-#else
 	return(ret);
-#endif
 }
 
 
@@ -980,7 +746,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;
@@ -991,22 +757,16 @@ void budetect(const char *file, int line, char *function)
 	struct mISDNport *mISDNport = mISDNport_first;
 	int i, ii;
 
-	while(mISDNport)
-	{
+	while(mISDNport) {
 		i = 0;
 		ii = mISDNport->b_num;
-		while(i < ii)
-		{
-			if (mISDNport->b_port[i])
-			{
+		while(i < ii) {
+			if (mISDNport->b_port[i]) {
 				port = port_first;
-				while(port)
-				{
-					if ((port->p_type&PORT_CLASS_MASK) == PORT_CLASS_ISDN)
-					{
+				while(port) {
+					if ((port->p_type&PORT_CLASS_MASK) == PORT_CLASS_ISDN) {
 						pmisdn = (class PmISDN *)port;
-						if (pmisdn->p_isdn_crypt_listen)
-						{
+						if (pmisdn->p_isdn_crypt_listen) {
 							PERROR_RUNTIME("************************************************\n");
 							PERROR_RUNTIME("** BUG detected in %s, line %d, function %s\n", file, line, function);
 							PERROR_RUNTIME("** p_isdn_crypt_listen = %d\n", pmisdn->p_isdn_crypt_listen);
@@ -1017,8 +777,7 @@ void budetect(const char *file, int line, char *function)
 					if (port == mISDNport->b_port[i])
 						break;
 					port = port->next;
-					if (!port)
-					{
+					if (!port) {
 						PERROR_RUNTIME("************************************************\n");
 						PERROR_RUNTIME("** BUG detected in %s, line %d, function %s\n", file, line, function);
 						PERROR_RUNTIME("** b_port not in list.\n");