X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm_conf.c;h=a64f2ff8863b9a750f30d027eb1e2714a4c5abc9;hp=9957b861b916eecb037659e5d0ecf4b68cdd4e95;hb=8a041720cbacf564cde530aca377c5e059f44630;hpb=cf1ea15cc320019d7b41eb56aeeb3c1956fbb7a0

diff --git a/gsm_conf.c b/gsm_conf.c
index 9957b86..a64f2ff 100644
--- a/gsm_conf.c
+++ b/gsm_conf.c
@@ -12,13 +12,11 @@
 #include "main.h"
 
 
-char *gsm_conf_error = (char *)"";
-
 /* read options
  *
  * read options from options.conf
  */
-int gsm_conf(struct gsm_conf *gsm_conf)
+int gsm_conf(struct gsm_conf *gsm_conf, char *conf_error)
 {
 	FILE *fp=NULL;
 	char filename[128];
@@ -37,20 +35,17 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 	SCPY(gsm_conf->openbsc_cfg, "openbsc.cfg");
 	gsm_conf->reject_cause = 0;
 	gsm_conf->keep_l2 = 0;
-	gsm_conf->noemergshut = 0;
 
 	SPRINT(filename, "%s/gsm.conf", CONFIG_DATA);
 
 	if (!(fp=fopen(filename,"r"))) {
-		SPRINT(gsm_conf_error, "Cannot open %s\n",filename);
+		UPRINT(conf_error, "Cannot open %s\n",filename);
 		return(0);
 	}
 
 	line=0;
-	while((fgets(buffer,sizeof(buffer),fp))) {
+	while((GETLINE(buffer, fp))) {
 		line++;
-		buffer[sizeof(buffer)-1]=0;
-		if (buffer[0]) buffer[strlen(buffer)-1]=0;
 		p=buffer;
 
 		while(*p <= 32) { /* skip spaces */
@@ -65,7 +60,7 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 		i=0; /* read option */
 		while(*p > 32) {
 			if (i+1 >= sizeof(option)) {
-				SPRINT(gsm_conf_error, "Error in %s (line %d): option too long.\n",filename,line);
+				UPRINT(conf_error, "Error in %s (line %d): option too long.\n",filename,line);
 				goto error;
 			}
 			option[i+1] = '\0';
@@ -84,7 +79,7 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 			i=0; /* read param */
 			while(*p > 32) {
 				if (i+1 >= sizeof(params[pnum])) {
-					SPRINT(gsm_conf_error, "Error in %s (line %d): param too long.\n",filename,line);
+					UPRINT(conf_error, "Error in %s (line %d): param too long.\n",filename,line);
 					goto error;
 				}
 				params[pnum][i+1] = '\0';
@@ -104,7 +99,7 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 		/* check option */
 		if (!strcmp(option,"debug")) {
 			if (params[0][0]==0) {
-				SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				UPRINT(conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
 				goto error;
 			}
 			SCPY(gsm_conf->debug, params[0]);
@@ -112,7 +107,7 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 		} else
 		if (!strcmp(option,"interface-bsc")) {
 			if (params[0][0]==0) {
-				SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
+				UPRINT(conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
 				goto error;
 			}
 			SCPY(gsm_conf->interface_bsc, params[0]);
@@ -120,7 +115,7 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 		} else
 		if (!strcmp(option,"interface-lcr")) {
 			if (params[0][0]==0) {
-				SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
+				UPRINT(conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
 				goto error;
 			}
 			SCPY(gsm_conf->interface_lcr, params[0]);
@@ -128,7 +123,7 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 		} else
 		if (!strcmp(option,"config")) {
 			if (params[0][0]==0) {
-				SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
+				UPRINT(conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
 				goto error;
 			}
 			SCPY(gsm_conf->openbsc_cfg, params[0]);
@@ -136,19 +131,15 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 		} else
 		if (!strcmp(option,"hlr")) {
 			if (params[0][0]==0) {
-				SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
+				UPRINT(conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
 				goto error;
 			}
 			SCPY(gsm_conf->hlr, params[0]);
 
 		} else
 		if (!strcmp(option,"reject-cause")) {
-			if (params[0][0]==0) {
-				SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
-				goto error;
-			}
-			gsm_conf->reject_cause = atoi(params[0]);
-
+			UPRINT(conf_error, "Option '%s' in gsm.conf has moved to openbsc.cfg", option);
+			goto error;
 		} else
 		if (!strcmp(option,"allow-all")) {
 			gsm_conf->allow_all = 1;
@@ -157,20 +148,14 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 			gsm_conf->keep_l2 = 1;
 
 		} else
-		if (!strcmp(option,"no-mergency-shutdown")) {
-			gsm_conf->noemergshut = 1;
-		} else
-		if (!strcmp(option,"rtp-proxy")) {
-			gsm_conf->rtp_proxy = 1;
-		} else
 		if (!strcmp(option,"pcapfile")) {
 			if (params[0][0]==0) {
-				SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
+				UPRINT(conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
 				goto error;
 			}
 			SCPY(gsm_conf->pcapfile, params[0]);
 		} else {
-			SPRINT(gsm_conf_error, "Error in %s (line %d): wrong option keyword %s.\n", filename,line,option);
+			UPRINT(conf_error, "Error in %s (line %d): wrong option keyword %s.\n", filename,line,option);
 			goto error;
 		}
 	}