X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.c;h=e2d3f136f07c653b3b7ec4818f25b736fa607c50;hp=931ac2aa0a6a7a5bc5874f6d10deabb9cf8271e9;hb=882882e0e2f6c451c4b9a5aa8209aa60352049c9;hpb=8038fd190f3c0b451c07253190ec1d7de9ea822a

diff --git a/main.c b/main.c
index 931ac2a..e2d3f13 100644
--- a/main.c
+++ b/main.c
@@ -11,26 +11,17 @@
 
 #include "main.h"
 
-MESSAGES
+//MESSAGES
 
-double now_d, last_d;
-time_t now;
-struct tm *now_tm;
 struct timeval now_tv;
 struct timezone now_tz;
 #define GET_NOW() \
 	{ \
 		gettimeofday(&now_tv, &now_tz); \
 		now_d = ((double)(now_tv.tv_usec))/1000000 + now_tv.tv_sec; \
-		now = now_tv.tv_sec; \
-		now_tm = localtime(&now); \
 	}
 
-#ifdef SOCKET_MISDN
 FILE *debug_fp = NULL;
-#else
-int global_debug = 0;
-#endif
 int quit=0;
 
 #if 0
@@ -53,36 +44,28 @@ int classuse = 0;
 int fduse = 0;
 int fhuse = 0;
 
-char *debug_prefix = 0;
 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(const char *function, int line, const char *prefix, char *buffer)
 {
-	usleep(msec);
-}
+	time_t now;
+	struct tm *now_tm;
 
-void debug(const char *function, int line, 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;
+		time(&now);
+		now_tm = localtime(&now);
 		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)
-	{
+	if (!nooutput) {
 		if (debug_newline)
 			printf("\033[32m%06d %s\033[37m%s", debug_count%1000000, prefix?prefix:"", prefix?" ":"");
 		if (function)
@@ -91,26 +74,12 @@ void debug(const char *function, int line, char *prefix, char *buffer)
 			printf("%s", buffer);
 	}
 
-#ifdef SOCKET_MISDN
-	if (debug_fp)
-#else
-	if (options.deb&DEBUG_LOG && global_debug)
-#endif
-	{
-		if (debug_newline)
-		{
+	if (debug_fp) {
+		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
 		}
 	}
 
@@ -121,7 +90,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;
@@ -135,7 +104,7 @@ void _printdebug(const char *function, int line, unsigned long mask, const char
 	buffer[sizeof(buffer)-1]=0;
 	va_end(args);
 
-	debug(function, line, debug_prefix, buffer);
+	debug(function, line, "DEBUG", buffer);
 
 	pthread_mutex_unlock(&mutexd);
 }
@@ -154,8 +123,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
@@ -174,18 +142,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, "LCR: Signal received: %d\n", sigset);
-		PERROR("Signal received: %d\n", sigset);
+		PDEBUG(DEBUG_LOG, "Signal received: %d\n", sigset);
 	}
 }
 
@@ -195,21 +161,20 @@ void sighandler(int sigset)
  */
 int main(int argc, char *argv[])
 {
+#ifdef WITH_GSM
+	double			now_d, last_d;
+	int			all_idle;
+#endif
 	int			ret = -1;
 	int			lockfd = -1; /* file lock */
 	struct lcr_msg		*message;
-	class Port		*port;
-	class Endpoint		*epoint;
-	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_mutext = 0,*/ created_mutexe = 0,
-        			created_lock = 0, created_signal = 0, created_debug = 0;
-	int			idletime = 0, idlecheck = 0;
-	char			tracetext[256];
+        			created_lock = 0, created_signal = 0, created_debug = 0,
+				created_misdn = 0;
+	char			tracetext[256], lock[128];
+	char			options_error[256];
 
 #if 0
 	/* init fdset */
@@ -219,15 +184,11 @@ int main(int argc, char *argv[])
 	/* lock LCR process */
 //	pthread_mutex_lock(&mutex_lcr);
 
-	/* current time */
-	GET_NOW();
-
 	/* show version */
 	printf("\n** %s  Version %s\n\n", NAME, VERSION_STRING);
 
 	/* show options */
-	if (argc <= 1)
-	{
+	if (argc <= 1) {
 		usage:
 		printf("\n");
 		printf("Usage: lcr (query | start | fork | rules | route)\n");
@@ -246,44 +207,32 @@ 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))
-	{
+	if (pthread_mutex_init(&mutexd, NULL)) {
 		fprintf(stderr, "cannot create 'PDEBUG' mutex\n");
 		goto free;
 	}
 	created_mutexd = 1;
-//	if (pthread_mutex_init(&mutext, 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))
-	{
+	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 (!(strcasecmp(argv[1],"rules"))) {
 		if (argc <= 2)
 			doc_rules(NULL);
 		else
@@ -293,20 +242,24 @@ int main(int argc, char *argv[])
 	}
 
 	/* query available isdn ports */
-	if (!(strcasecmp(argv[1],"query")))
-	{
-		mISDN_port_info();
+	if (!(strcasecmp(argv[1],"query"))) {
+		int rc;
+		fprintf(stderr, "-> Using 'misdn_info'\n");
+		rc = system("misdn_info");
 		ret = 0;
 		goto free;
 	}
 
 	/* read options */
-	if (read_options() == 0)
+	if (read_options(options_error) == 0) {
+		PERROR("%s", options_error);
 		goto free;
+	}
 
 	/* init mISDN */
 	if (mISDN_initialize() < 0)
 		goto free;
+	created_misdn = 1;
 	created_debug = 1;
 
 	/* read ruleset(s) */
@@ -315,8 +268,7 @@ int main(int argc, char *argv[])
 
 	/* 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);
@@ -324,8 +276,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;
@@ -333,20 +284,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);
@@ -355,32 +304,36 @@ 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)
-		{
+		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/lcr.lock", O_CREAT, 0)) < 0)
-	{
-		fprintf(stderr, "Cannot create lock file: /var/run/lcr.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, "LCR: Another LCR process is running. Please kill the other one.\n");
 		else	fprintf(stderr, "Locking process failed: errno=%d\n", errno);
@@ -389,8 +342,7 @@ int main(int argc, char *argv[])
 	created_lock = 1;
 
 	/* initialize admin socket */
-	if (admin_init())
-	{
+	if (admin_init()) {
 		fprintf(stderr, "Unable to initialize admin socket.\n");
 		goto free;
 	}
@@ -398,16 +350,33 @@ int main(int argc, char *argv[])
 	/* generate alaw / ulaw tables */
 	generate_tables(options.law);
 
+#ifdef WITH_SS5
+	/* init ss5 sine tables */
+	ss5_sine_generate();
+	ss5_test_decode();
+#endif
+
 	/* load tones (if requested) */
-	if (fetch_tones() == 0)
-	{
+	if (fetch_tones() == 0) {
 		fprintf(stderr, "Unable to fetch tones into memory.\n");
 		goto free;
 	}
 
+#ifdef WITH_GSM
+	/* handle gsm */
+	if (options.gsm && 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 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;
@@ -418,40 +387,34 @@ int main(int argc, char *argv[])
 	
 	/* 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;
 		}
@@ -464,219 +427,69 @@ int main(int argc, char *argv[])
 	signal(SIGPIPE,sighandler);
 	created_signal = 1;
 
+	/* init message */
+	init_message();
+
 	/*** 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)
-	{
-
+#ifdef WITH_GSM
+	GET_NOW();
+#endif
+	while(!quit) {
+#ifdef WITH_GSM
 		last_d = now_d;
 		GET_NOW();
-		if (now_d-last_d > 1.0)
-		{
+		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 */
 		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())
+		/* must be processed after all queues, so they are empty */
+		if (select_main(1, NULL, NULL, NULL))
 			all_idle = 0;
-//#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)
-		{
-			debug_prefix = port->p_name;
-			debug_count++;
-			ret = port->handler();
-			if (ret)
-				all_idle = 0;
-			if (ret < 0) /* port has been destroyed */
-				goto port_again;
-			port = port->next;
-		}
-
-		/* loop through all epoint and call their handler */
-		epoint_again:
-		epoint = epoint_first;
-		while(epoint)
-		{
-			debug_prefix = prefix_string;
-			SPRINT(prefix_string, "ep%ld", epoint->ep_serial);
-			debug_count++;
-			ret = epoint->handler();
-			if (ret)
+		/* handle gsm */
+		if (options.gsm)
+			while(handle_gsm())
 				all_idle = 0;
-			if (ret < 0) /* epoint has been destroyed */
-				goto epoint_again;
-			epoint = epoint->next;
-		}
-
-		/* loop through all joins and call their handler */
-		join_again:
-		join = join_first;
-		while(join)
-		{
-			debug_prefix = "join";
-			debug_count++;
-			ret = join->handler();
-			if (ret)
-				all_idle = 0;
-			if (ret < 0) /* join has been destroyed */
-				goto join_again;
-			join = join->next;
-		}
-
-		debug_prefix = 0;
-
-		/* process any message */
-		debug_count++;
-		debug_prefix = "message";
-		while ((message = message_get()))
-		{
-			all_idle = 0;
-			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)
-					{
-						epoint->ep_app->ea_message_port(message->id_from, message->type, &message->param);
-					} 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
-				{
-					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_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 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_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 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)
-				{
-					port->message_epoint(message->id_from, message->type, &message->param);
-BUDETECT
-				} 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;
-
-				default:
-				PERROR("Message flow %d unknown.\n", message->flow);
-			}
-			message_free(message);
-			debug_count++;
-			debug_prefix = "message";
-		}
-BUDETECT
-
-		/* handle socket */
-		if (admin_handle())
-			all_idle = 0;
-BUDETECT
-
-#if 0
-		/* check for child to exit (eliminate zombies) */
-		if (waitpid(-1, NULL, WNOHANG) > 0)
-		{
-			PDEBUG(DEBUG_EPOINT, "a child process (created by endpoint) has exitted.\n");
-			all_idle = 0;
+		if (all_idle) {
+			usleep(10000);
 		}
+#else
+		if (options.polling)
+			if (!select_main(1, NULL, NULL, NULL))
+				usleep(10000);
+		else
+			select_main(0, NULL, NULL, NULL);
 #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)
-		{
-			PDEBUG(DEBUG_IDLETIME, "Idle time : %d%%\n", idletime/10000);
-			idletime = 0;
-			idlecheck = now;
-		}
-
-		/* 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;
 
+	/* clean messacleane */
+	cleanup_message();
+
 	/* free all */
 free:
 
-
 	/* set scheduler & priority
 	 */
-	if (options.schedule > 1)
-	{
+	if (options.schedule > 1) {
 		memset(&schedp, 0, sizeof(schedp));
 		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);
@@ -684,15 +497,12 @@ free:
 	}
 
 	/* destroy objects */
-	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;
 	}
@@ -711,13 +521,11 @@ 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);
 	}
 
@@ -731,8 +539,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)
@@ -751,14 +562,20 @@ free:
 			fprintf(stderr, "cannot destroy 'PDEBUG' mutex\n");
 
 	/* deinitialize mISDN */
-	mISDN_deinitialize();
+	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(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"); \
@@ -785,62 +602,4 @@ free:
 }
 
 
-#ifdef BUDETECT_DEF
-/* special debug function to detect buffer overflow
- */
-int budetect_stop = 0;
-void budetect(const char *file, int line, char *function)
-{
-	if (budetect_stop)
-		return;
-	/* modify this function to detect race-bugs */
-#warning DID YOU MODIFY THIS FUNCTION TO DETECT THE BUFFER OVERFLOW BUG?
-	class Port *port;
-	class PmISDN *pmisdn;
-	struct mISDNport *mISDNport = mISDNport_first;
-	int i, ii;
-
-	while(mISDNport)
-	{
-		i = 0;
-		ii = mISDNport->b_num;
-		while(i < ii)
-		{
-			if (mISDNport->b_port[i])
-			{
-				port = port_first;
-				while(port)
-				{
-					if ((port->p_type&PORT_CLASS_MASK) == PORT_CLASS_ISDN)
-					{
-						pmisdn = (class PmISDN *)port;
-						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);
-							PERROR_RUNTIME("************************************************\n");
-							budetect_stop = 1;
-						}
-					}
-					if (port == mISDNport->b_port[i])
-						break;
-					port = port->next;
-					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");
-						PERROR_RUNTIME("************************************************\n");
-						budetect_stop = 1;
-					}
-				}
-			}
-			i++;
-		}
-		mISDNport = mISDNport->next;
-	}
-
-}
-#endif