X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.c;h=59343aef1aed4a0556948ddfe68a9d70520e1a95;hp=8fe35a726828411933158b1cdc3cc15f1291aa14;hb=b1ab2b9ac1cfc15d2a8f5850145dd69043cc3ef7;hpb=da21ec0158f0be010a75d42c058fdc8891498b2d

diff --git a/main.c b/main.c
index 8fe35a7..59343ae 100644
--- a/main.c
+++ b/main.c
@@ -26,11 +26,7 @@ struct timezone now_tz;
 		now_tm = localtime(&now); \
 	}
 
-#ifdef SOCKET_MISDN
 FILE *debug_fp = NULL;
-#else
-int global_debug = 0;
-#endif
 int quit=0;
 
 #if 0
@@ -38,9 +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
+//pthread_mutex_t mutex_lcr; // lcr process mutex
 
 int memuse = 0;
 int mmemuse = 0;
@@ -72,13 +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);
-#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)
@@ -91,26 +82,14 @@ 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 (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 +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;
@@ -176,7 +155,7 @@ void sighandler(int sigset)
 		return;
 	if (!quit)
 	{
-		quit=1;
+		quit = sigset;
 		/* set scheduler & priority */
 		if (options.schedule > 1)
 		{
@@ -185,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);
 	}
 }
 
@@ -197,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;
@@ -207,9 +186,10 @@ int main(int argc, char *argv[])
 	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 */
@@ -217,7 +197,7 @@ int main(int argc, char *argv[])
 #endif
 
 	/* lock LCR process */
-	pthread_mutex_lock(&mutex_lcr);
+//	pthread_mutex_lock(&mutex_lcr);
 
 	/* current time */
 	GET_NOW();
@@ -246,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))
 	{
@@ -295,18 +268,23 @@ int main(int argc, char *argv[])
 	/* 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) */
@@ -374,9 +352,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)) < 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)
@@ -430,18 +410,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, 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 */
@@ -648,17 +627,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
+//			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
+//			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);
+	if (quit)
+		add_trace("signal", NULL, "%d", quit);
 	end_trace();
 	ret=0;
 
@@ -732,7 +711,11 @@ free:
 	if (created_lock)
 		flock(lockfd, LOCK_UN);
 	if (lockfd >= 0)
+	{
+		chmod(lock, 0700);
+		unlink(lock);
 		close(lockfd);
+	}
 
 	/* free rulesets */
 	if (ruleset_first)
@@ -751,7 +734,8 @@ free:
 			fprintf(stderr, "cannot destroy 'PDEBUG' mutex\n");
 
 	/* deinitialize mISDN */
-	mISDN_deinitialize();
+	if (created_misdn)
+		mISDN_deinitialize();
 
 	/* display memory leak */
 #define MEMCHECK(a, b) \
@@ -778,7 +762,7 @@ free:
 	MEMCHECK("file handler(s) left",fhuse)
 
 	/* unlock LCR process */
-	pthread_mutex_unlock(&mutex_lcr);
+//	pthread_mutex_unlock(&mutex_lcr);
 
 	/* take me out */
 	return(ret);