X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=options.c;h=160a8a87c584dd1f70dbc2bfba0d2c5346558aa9;hp=db6c9fc0dbb20add4dfec0f3000e89216473f528;hb=a425aedc1ee2c0bba4ba20904943afb21bd6e2e5;hpb=d9d954e58d6acf8c3de95402110e691f0bc29688

diff --git a/options.c b/options.c
index db6c9fc..160a8a8 100644
--- a/options.c
+++ b/options.c
@@ -9,31 +9,33 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include "main.h"
+#include "stdio.h"
+#include "string.h"
+#include "stdarg.h"
+#include "unistd.h"
+#include "stdlib.h"
+#include "macro.h"
+#include "extension.h"
+#include "options.h"
 
 struct options options = {
 	"/usr/local/lcr/log",		/* log file */
-	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
 	0x0000,				/* debug mode */
 	'a',				/* a-law */
 	"0",				/* national prefix */
 	"00",				/* international prefix */
 	"tones_american",		/* directory of tones */
 	"",				/* directories of tones to fetch */
-	"extensions",			/* directory of extensions */
 	"",				/* dummy caller id */
 	0,				/* use tones by dsp.o */
 	0,				/* by default use priority 0 */
-	"lcr@your.machine"		/* source mail adress */
+	"lcr@your.machine",		/* source mail adress */
+	"/var/tmp",			/* path of lock files */
+	0700				/* rights of lcr admin socket */
 };
 
+char options_error[256];
+
 /* read options
  *
  * read options from options.conf
@@ -48,12 +50,12 @@ int read_options(void)
 	unsigned int line,i;
 	char buffer[256];
 
-	SPRINT(filename, "%s/options.conf", INSTALL_DATA);
+	SPRINT(filename, "%s/options.conf", CONFIG_DATA);
 
 	if (!(fp=fopen(filename,"r")))
 	{
-		PERROR("Cannot open %s\n",filename);
-		return(-1);
+		SPRINT(options_error, "Cannot open %s\n",filename);
+		return(0);
 	}
 
 	line=0;
@@ -79,7 +81,7 @@ int read_options(void)
 		{
 			if (i+1 >= sizeof(option))
 			{
-				PERROR_RUNTIME("Error in %s (line %d): option too long.\n",filename,line);
+				SPRINT(options_error, "Error in %s (line %d): option too long.\n",filename,line);
 				goto error;
 			}
 			option[i+1] = '\0';
@@ -101,7 +103,7 @@ int read_options(void)
 			{
 				if (i+1 >= sizeof(param))
 				{
-					PERROR_RUNTIME("Error in %s (line %d): param too long.\n",filename,line);
+					SPRINT(options_error, "Error in %s (line %d): param too long.\n",filename,line);
 					goto error;
 				}
 				param[i+1] = '\0';
@@ -114,124 +116,81 @@ int read_options(void)
 		/* check option */
 		if (!strcmp(option,"nt_if") || !strcmp(option,"te_if"))
 		{
-			PERROR_RUNTIME("Error in %s (line %d): obsolete option %s. Use multiple 'port' options to define ports to use.\n",filename,line,option);
+			SPRINT(options_error, "Error in %s (line %d): obsolete option %s. Use multiple 'port' options to define ports to use.\n",filename,line,option);
 			goto error;
 		} else
 		if (!strcmp(option,"debug"))
 		{
 			if (param[0]==0)
 			{
-				PERROR_RUNTIME("Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
 				goto error;
 			}
 			options.deb = strtol(param, NULL, 0);
 
-			PDEBUG(DEBUG_CONFIG, "debugging: 0x%x\n", options.deb);
 		} else
 		if (!strcmp(option,"log"))
 		{
 			if (param[0]==0)
 			{
-				PERROR_RUNTIME("Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
+				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
 				goto error;
 			}
 			SCPY(options.log, param);
 
-			PDEBUG(DEBUG_CONFIG, "log file: %s\n", options.log);
-		} else
-		if (!strcmp(option,"port"))
-		{
-			i = strtol(param, NULL, 0);
-			if (i < 1 || i > sizeof(options.ports))
-			{
-				PERROR_RUNTIME("Error in %s (line %d): port number %s out of range.\n", filename, line, option);
-				goto error;
-			}
-			options.ports[i] |= FLAG_PORT_USE;
-
-			PDEBUG(DEBUG_CONFIG, "adding interface: %d (param=%s)\n", i, param);
-			if (strstr(param, "ptp"))
-			{
-				options.ports[i] |= FLAG_PORT_PTP;
-				PDEBUG(DEBUG_CONFIG, " -> interface shall be ptp\n");
-			}
-		} else
-#if 0
-		if (!strcmp(option,"ptp"))
-		{
-			options.ptp = 1;
-
-			PDEBUG(DEBUG_CONFIG, "ptp layer-2 watch and keep established.\n");
 		} else
-#endif
 		if (!strcmp(option,"alaw"))
 		{
 			options.law = 'a';
 
-			PDEBUG(DEBUG_CONFIG, "isdn audio type: alaw\n");
 		} else
 		if (!strcmp(option,"ulaw"))
 		{
 			options.law = 'u';
 
-			PDEBUG(DEBUG_CONFIG, "isdn audio type: ulaw\n");
 		} else
 		if (!strcmp(option,"tones_dir"))
 		{
 			if (param[0]==0)
 			{
-				PERROR_RUNTIME("Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
 				goto error;
 			}
 			if (param[strlen(param)-1] == '/')
 				param[strlen(param)-1]=0;
 			SCPY(options.tones_dir, param);
 
-			PDEBUG(DEBUG_CONFIG, "directory of tones: %s\n",param);
 		} else
 		if (!strcmp(option,"fetch_tones"))
 		{
 			if (param[0]==0)
 			{
-				PERROR_RUNTIME("Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
 				goto error;
 			}
 			if (param[strlen(param)-1] == '/')
 				param[strlen(param)-1]=0;
 			SCPY(options.fetch_tones, param);
 
-			PDEBUG(DEBUG_CONFIG, "directories of tones to fetch: %s\n",param);
 		} else
 		if (!strcmp(option,"extensions_dir"))
 		{
-			if (param[0]==0)
-			{
-				PERROR_RUNTIME("Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
-				goto error;
-			}
-			if (param[strlen(param)-1] == '/')
-				param[strlen(param)-1]=0;
-			SCPY(options.extensions_dir, param);
-
-			PDEBUG(DEBUG_CONFIG, "directory of extensions: %s\n",param);
+			// obsolete
 		} else
 		if (!strcmp(option,"national"))
 		{
 			SCPY(options.national, param);
 
-			PDEBUG(DEBUG_CONFIG, "national dial prefix: %s\n", param);
 		} else
 		if (!strcmp(option,"international"))
 		{
 			SCPY(options.international, param);
 
-			PDEBUG(DEBUG_CONFIG, "inernational dial prefix: %s\n", param);
 		} else
 		if (!strcmp(option,"dummyid"))
 		{
 			SCPY(options.dummyid, param);
 
-			PDEBUG(DEBUG_CONFIG, "dummy caller id\n", param);
 		} else
 		if (!strcmp(option,"dsptones"))
 		{
@@ -244,44 +203,54 @@ int read_options(void)
 			else if (!strcasecmp(param, "none"))
 				options.dsptones = DSP_NONE;
 			else {
-				PERROR_RUNTIME("Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
 				goto error;
 			}
 
-			PDEBUG(DEBUG_CONFIG, "dsp tones = %d\n", options.dsptones);
 		} else
 		if (!strcmp(option,"schedule"))
 		{
 			options.schedule = atoi(param);
 			if (options.schedule < 0)
 			{
-				PERROR_RUNTIME("Error in %s (line %d): parameter for option %s must be at least '0'.\n", filename,line,option);
+				SPRINT(options_error, "Error in %s (line %d): parameter for option %s must be at least '0'.\n", filename,line,option);
 				goto error;
 			}
 			if (options.schedule > 99)
 			{
-				PERROR_RUNTIME("Error in %s (line %d): parameter for option %s must be '99' or less.\n", filename,line,option);
+				SPRINT(options_error, "Error in %s (line %d): parameter for option %s must be '99' or less.\n", filename,line,option);
 				goto error;
 			}
 
-			if (atoi(param))
-				PDEBUG(DEBUG_CONFIG, "use real time scheduler priority: %d\n", atoi(param));
-			else
-				PDEBUG(DEBUG_CONFIG, "don't use real time scheduler\n");
 		} else
 		if (!strcmp(option,"email"))
 		{
 			if (param[0]==0)
 			{
-				PERROR_RUNTIME("Error in %s (line %d): parameter for option %s missing.\n", filename,line,option);
+				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n", filename,line,option);
 				goto error;
 			}
 			SCPY(options.email, param);
 
-			PDEBUG(DEBUG_CONFIG, "source mail address of pbx: %s\n", param);
+		} else
+		if (!strcmp(option,"lock"))
+		{
+			if (param[0]==0)
+			{
+				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				goto error;
+			}
+			if (param[strlen(param)-1] == '/')
+				param[strlen(param)-1]=0;
+			SCPY(options.lock, param);
+
+		} else
+		if (!strcmp(option,"socketrights"))
+		{
+			options.socketrights = strtol(param, NULL, 0);
 		} else
 		{
-			PERROR_RUNTIME("Error in %s (line %d): wrong option keyword %s.\n", filename,line,option);
+			SPRINT(options_error, "Error in %s (line %d): wrong option keyword %s.\n", filename,line,option);
 			goto error;
 		}
 	}
@@ -289,13 +258,13 @@ int read_options(void)
 #if 0
 	if (!options.dsptones)
 	{
-		PERROR_RUNTIME("Error in %s (line %d): option 'dsptones' missing.\n", filename);
+		SPRINT(options_error, "Error in %s (line %d): option 'dsptones' missing.\n", filename);
 		goto error;
 	}
 #endif
 	if (!options.tones_dir[0])
 	{
-		PERROR_RUNTIME("Error in %s (line %d): option 'tones_dir' with parameter missing.\n", filename);
+		SPRINT(options_error, "Error in %s (line %d): option 'tones_dir' with parameter missing.\n", filename);
 		goto error;
 	}
 	if (fp) fclose(fp);