X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.c;h=51da4a133a403d7dd42b8e968166760a50962c44;hp=cf6be07352972df7bf9cd855e669c2770d746099;hb=b2f6c87b1b020e4ac30658422bb144ee3f05a842;hpb=a114e74299f4708d96b490be055ab8939b9e7610

diff --git a/main.c b/main.c
index cf6be07..51da4a1 100644
--- a/main.c
+++ b/main.c
@@ -49,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)
@@ -184,12 +184,12 @@ 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_misdn = 0;
 	int			idletime = 0, idlecheck = 0;
-	char			tracetext[256];
+	char			tracetext[256], lock[128];
 
 #if 0
 	/* init fdset */
@@ -268,8 +268,8 @@ int main(int argc, char *argv[])
 	/* query available isdn ports */
 	if (!(strcasecmp(argv[1],"query")))
 	{
-		fprintf(stderr, "-> Using 'isdninfo'\n");
-		system("isdninfo");
+		fprintf(stderr, "-> Using 'misdn_info'\n");
+		system("misdn_info");
 		ret = 0;
 		goto free;
 	}
@@ -314,6 +314,7 @@ int main(int argc, char *argv[])
 	if (!(strcasecmp(argv[1],"fork")))
 	{
 		pid_t pid;
+		FILE *pidfile;
 
 		/* do daemon fork */
 		pid = fork();
@@ -344,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"))
@@ -352,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)
@@ -408,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 */
@@ -444,7 +454,7 @@ 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();
@@ -634,9 +644,9 @@ BUDETECT
 	}
 	SPRINT(tracetext, "%s terminated", NAME);
 	printf("%s\n", tracetext);
-	start_trace(0, NULL, NULL, NULL, 0, 0, 0, tracetext);
+	start_trace(-1, NULL, NULL, NULL, 0, 0, 0, tracetext);
 	if (quit)
-		add_trace("signal", NULL, "%d", quit);
+		add_trace((char *)"signal", NULL, "%d", quit);
 	end_trace();
 	ret=0;
 
@@ -710,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)
@@ -737,7 +751,7 @@ free:
 	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"); \
@@ -768,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;