X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=interface.c;h=e7ab1710d94008ebba1cb368ecbf43be73424cb5;hp=9ab3c2ce3b08b57030277aed501272a5e4cb4ce2;hb=51c27d3a306987244398b65e2f1d465a98386f2a;hpb=6db34c1dca5c3a2acd0af689319b583ff8271dbc

diff --git a/interface.c b/interface.c
index 9ab3c2c..e7ab171 100644
--- a/interface.c
+++ b/interface.c
@@ -114,6 +114,10 @@ static int inter_block(struct interface *interface, char *filename, int line, ch
 }
 static int inter_extension(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
+	if (interface->external) {
+		SPRINT(interface_error, "Error in %s (line %d): parameter '%s' not allowed, because interface is external interface.\n", filename, line, parameter);
+		return(-1);
+	}
 	if (value[0]) {
 		SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects no value.\n", filename, line, parameter);
 		return(-1);
@@ -121,6 +125,19 @@ static int inter_extension(struct interface *interface, char *filename, int line
 	interface->extension = 1;
 	return(0);
 }
+static int inter_extern(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+	if (interface->extension) {
+		SPRINT(interface_error, "Error in %s (line %d): parameter '%s' not allowed, because interface is an extension.\n", filename, line, parameter);
+		return(-1);
+	}
+	if (value[0]) {
+		SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects no value.\n", filename, line, parameter);
+		return(-1);
+	}
+	interface->external = 1;
+	return(0);
+}
 static int inter_ptp(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
 	struct interface_port *ifport;
@@ -301,23 +318,30 @@ static int inter_portname(struct interface *interface, char *filename, int line,
 	struct interface_port *ifport, **ifportp;
 	struct interface *searchif;
 
-	/* check for port already assigned */
+	/* goto end of chain */
+	ifport = interface->ifport;
+	if (ifport) {
+		while(ifport->next)
+			ifport = ifport->next;
+	}
+
+	/* check for port already assigned, but not for shared gsm interface */
 	searchif = interface_newlist;
-	while(searchif) {
-		ifport = searchif->ifport;
-		while(ifport) {
-			if (!strcasecmp(ifport->portname, value)) {
-				SPRINT(interface_error, "Error in %s (line %d): port '%s' already used above.\n", filename, line, value);
-				return(-1);
-			}
-			/* check for use as GSM */
-			if (ifport->gsm) {
-				SPRINT(interface_error, "Error in %s (line %d): Interface already used for GSM.\n", filename, line);
-				return(-1);
+#if defined WITH_GSM_BS || defined WITH_GSM_MS
+	if (options.gsm && !strcmp(value, gsm->conf.interface_lcr))
+#endif
+	{
+		while(searchif) {
+			ifport = searchif->ifport;
+			while(ifport) {
+				if (!strcasecmp(ifport->portname, value)) {
+					SPRINT(interface_error, "Error in %s (line %d): port '%s' already used above.\n", filename, line, value);
+					return(-1);
+				}
+				ifport = ifport->next;
 			}
-			ifport = ifport->next;
+			searchif = searchif->next;
 		}
-		searchif = searchif->next;
 	}
 	/* alloc port substructure */
 	ifport = (struct interface_port *)MALLOC(sizeof(struct interface_port));
@@ -863,8 +887,13 @@ static int inter_tones_dir(struct interface *interface, char *filename, int line
 }
 static int inter_gsm(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
-#ifndef WITH_GSM
-	SPRINT(interface_error, "Error in %s (line %d): GSM not compiled in.\n", filename, line);
+	SPRINT(interface_error, "Error in %s (line %d): parameter '%s' is outdated.\nPlease use 'gsm-bs' for base station or 'gsm-ms' for mobile station interface!\n", filename, line, parameter);
+	return(-1);
+}
+static int inter_gsm_bs(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+#ifndef WITH_GSM_BS
+	SPRINT(interface_error, "Error in %s (line %d): GSM BS side not compiled in.\n", filename, line);
 	return(-1);
 #else
 	struct interface_port *ifport;
@@ -879,8 +908,8 @@ static int inter_gsm(struct interface *interface, char *filename, int line, char
 	while(searchif) {
 		ifport = searchif->ifport;
 		while(ifport) {
-			if (ifport->gsm) {
-				SPRINT(interface_error, "Error in %s (line %d): port '%s' already uses gsm\n", filename, line, value);
+			if (ifport->gsm_bs) {
+				SPRINT(interface_error, "Error in %s (line %d): port '%s' already uses gsm BS side.\n", filename, line, ifport->portname);
 				return(-1);
 			}
 			ifport = ifport->next;
@@ -889,16 +918,178 @@ static int inter_gsm(struct interface *interface, char *filename, int line, char
 	}
 
 	/* set portname */
-	if (inter_portname(interface, filename, line, "portname", gsm->conf.interface_lcr))
+	if (inter_portname(interface, filename, line, (char *)"portname", options.loopback_lcr))
 		return(-1);
-	/* goto end of chain again to set gsmflag*/
+
+	/* goto end of chain again to set gsmflag */
 	ifport = interface->ifport;
 	while(ifport->next)
 		ifport = ifport->next;
-	ifport->gsm = 1;
+	ifport->gsm_bs = 1;
+
 	return(0);
 #endif
 }
+static int inter_gsm_ms(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+#ifndef WITH_GSM_MS
+	SPRINT(interface_error, "Error in %s (line %d): GSM MS side not compiled in.\n", filename, line);
+	return(-1);
+#else
+	struct interface_port *ifport, *searchifport;
+	struct interface *searchif;
+	char *element;
+
+	/* check gsm */
+	if (!gsm) {
+		SPRINT(interface_error, "Error in %s (line %d): GSM is not activated.\n", filename, line);
+		return(-1);
+	}
+
+	/* set portname */
+	if (inter_portname(interface, filename, line, (char *)"portname", options.loopback_lcr))
+		return(-1);
+
+	/* goto end of chain again to set gsmflag and socket */
+	ifport = interface->ifport;
+	while(ifport->next)
+		ifport = ifport->next;
+	ifport->gsm_ms = 1;
+
+	/* copy values */
+	element = strsep(&value, " ");
+	if (!element || !element[0]) {
+		SPRINT(interface_error, "Error in %s (line %d): Missing MS name and socket name.\n", filename, line);
+		return(-1);
+	}
+	SCPY(ifport->gsm_ms_name, element);
+	element = strsep(&value, " ");
+	if (!element || !element[0]) {
+		SPRINT(interface_error, "Error in %s (line %d): Missing socket name after MS name.\n", filename, line);
+		return(-1);
+	}
+	SCPY(ifport->gsm_ms_socket, element);
+
+	/* check if socket is used multiple times */
+	searchif = interface_newlist;
+	while(searchif) {
+		searchifport = searchif->ifport;
+		while(searchifport) {
+			if (searchifport != ifport 
+			 && !strcmp(searchifport->gsm_ms_socket, ifport->gsm_ms_socket)) {
+				SPRINT(interface_error, "Error in %s (line %d): mobile '%s' already uses the given socket '%s', choose a different one.\n", filename, line, ifport->gsm_ms_name, searchifport->gsm_ms_socket);
+				return(-1);
+			}
+			searchifport = searchifport->next;
+		}
+		searchif = searchif->next;
+	}
+
+	return(0);
+#endif
+}
+static int inter_nonotify(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+	struct interface_port *ifport;
+
+	/* port in chain ? */
+	if (!interface->ifport) {
+		SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter);
+		return(-1);
+	}
+	/* goto end of chain */
+	ifport = interface->ifport;
+	while(ifport->next)
+		ifport = ifport->next;
+	ifport->nonotify = 1;
+	return(0);
+}
+#ifdef WITH_SS5
+static int inter_ss5(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+	struct interface_port *ifport;
+	char *element;
+
+	/* port in chain ? */
+	if (!interface->ifport) {
+		SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter);
+		return(-1);
+	}
+	/* goto end of chain */
+	ifport = interface->ifport;
+	while(ifport->next)
+		ifport = ifport->next;
+	ifport->ss5 |= SS5_ENABLE;
+	while((element = strsep(&value, " "))) {
+		if (element[0] == '\0')
+			continue;
+		if (!strcasecmp(element, "connect"))
+			ifport->ss5 |= SS5_FEATURE_CONNECT;
+		else
+		if (!strcasecmp(element, "nodisconnect"))
+			ifport->ss5 |= SS5_FEATURE_NODISCONNECT;
+		else
+		if (!strcasecmp(element, "releaseguardtimer"))
+			ifport->ss5 |= SS5_FEATURE_RELEASEGUARDTIMER;
+		else
+		if (!strcasecmp(element, "bell"))
+			ifport->ss5 |= SS5_FEATURE_BELL;
+		else
+		if (!strcasecmp(element, "pulsedialing"))
+			ifport->ss5 |= SS5_FEATURE_PULSEDIALING;
+		else
+		if (!strcasecmp(element, "delay"))
+			ifport->ss5 |= SS5_FEATURE_DELAY;
+		else
+		if (!strcasecmp(element, "starrelease"))
+			ifport->ss5 |= SS5_FEATURE_STAR_RELEASE;
+		else
+		if (!strcasecmp(element, "suppress"))
+			ifport->ss5 |= SS5_FEATURE_SUPPRESS;
+		else {
+			SPRINT(interface_error, "Error in %s (line %d): parameter '%s' does not allow value element '%s'.\n", filename, line, parameter, element);
+			return(-1);
+		}
+	}
+	return(0);
+}
+#endif
+static int inter_remote(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+	struct interface_port *ifport;
+	struct interface *searchif;
+
+	if (!value[0]) {
+		SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects application name as value.\n", filename, line, parameter);
+		return(-1);
+	}
+	searchif = interface_newlist;
+	while(searchif) {
+		ifport = searchif->ifport;
+		while(ifport) {
+			if (ifport->remote && !strcmp(ifport->remote_app, value)) {
+				SPRINT(interface_error, "Error in %s (line %d): port '%s' already uses remote application '%s'.\n", filename, line, ifport->portname, value);
+				return(-1);
+			}
+			ifport = ifport->next;
+		}
+		searchif = searchif->next;
+	}
+
+	/* set portname */
+	if (inter_portname(interface, filename, line, (char *)"portname", options.loopback_lcr))
+		return(-1);
+
+	/* goto end of chain again to set application name */
+	ifport = interface->ifport;
+	while(ifport->next)
+		ifport = ifport->next;
+	ifport->remote = 1;
+	SCPY(ifport->remote_app, value);
+
+
+	return(0);
+}
 
 
 /*
@@ -907,6 +1098,12 @@ static int inter_gsm(struct interface *interface, char *filename, int line, char
 struct interface_param interface_param[] = {
 	{ "extension", &inter_extension, "",
 	"If keyword is given, calls to interface are handled as internal extensions."},
+
+	{ "extern", &inter_extern, "",
+	"If keyword is given, this interface will be used for external calls.\n"
+	"Calls require an external interface, if the routing action 'extern' is used\nwithout specific interface given.\n"
+	"Calls forwarded by extension's 'settings' also require an external interface."},
+
 	{"tones", &inter_tones, "yes | no",
 	"Interface generates tones during call setup and release, or not.\nBy default only NT-mode ports generate tones."},
 
@@ -966,7 +1163,8 @@ struct interface_param interface_param[] = {
 	"Channel selection list for all outgoing calls to the interface.\n"
 	"A free channels is searched in order of appearance.\n"
 	"This parameter must follow a 'port' parameter.\n"
-	" force - Forces the selected port with no acceptable alternative (see DSS1).\n"
+	" force - Forces the selected port with no acceptable alternative (see Q.931).\n"
+	"  -> this will be automatically set for multipoint (ptmp) NT-mode ports\n"
 	" <number>[,...] - List of channels to search.\n"
 	" free - Select any free channel\n"
 	" any - On outgoing calls, signal 'any channel acceptable'. (see DSS1)\n"
@@ -1022,9 +1220,40 @@ struct interface_param interface_param[] = {
 	"To used kernel tones in mISDN_dsp.ko, say 'american', 'german', or 'oldgerman'."},
 
 	{"gsm", &inter_gsm, "",
-	"Sets up GSM interface for using OpenBSC.\n"
-	"This interface must be a loopback interface. The second loopback interface\n"
-	"must be assigned to OpenBSC"},
+	""},
+	{"gsm-bs", &inter_gsm_bs, "",
+	"Sets up GSM base station interface for using OpenBSC.\n"
+	"See the default/gsm.conf for configuration for this version."},
+	{"gsm-ms", &inter_gsm_ms, "[<socket>]",
+	"Sets up GSM mobile station interface for using Osmocom-BB.\n"
+	"See the default/gsm.conf for configuration for this version.\n"
+	"The name of the MS folows the interface name.\n"
+	"The socket is /tmp/osmocom_l2 by default and need to be changed when multiple\n"
+	"MS interfaces are used."},
+	{"nonotify", &inter_nonotify, "",
+	"Prevents sending notify messages to this interface. A call placed on hold will\n"
+	"Not affect the remote end (phone or telcom switch).\n"
+	"This parameter must follow a 'port' parameter."},
+
+#ifdef WITH_SS5
+	{"ccitt5", &inter_ss5, "[<feature> [feature ...]]",
+	"Interface uses CCITT No. 5 inband signalling rather than D-channel.\n"
+	"This feature causes CPU load to rise and has no practical intend.\n"
+	"If you don't know what it is, you don't need it.\n"
+	"Features apply to protocol behaviour and blueboxing specials, they are:\n"
+	" connect - Connect incomming call to throughconnect audio, if required.\n"
+	" nodisconnect - Don't disconnect if incomming exchange disconnects.\n"
+	" releaseguardtimer - Tries to prevent Blueboxing by a longer release-guard.\n"
+	" bell - Allow releasing and pulse-dialing via 2600 Hz like old Bell systems.\n"
+	" pulsedialing - Use pulse dialing on outgoing exchange. (takes long!)\n"
+	" delay - Use on incomming exchange, to make you feel a delay when blueboxing.\n"
+	" starrelease - Pulse dialing a star (11 pulses per digit) clears current call.\n"
+	" suppress - Suppress received tones, as they will be recognized."},
+#endif
+
+	{"remote", &inter_remote, "<application>",
+	"Sets up an interface that communicates with the remote application.\n"
+	"Use \"asterisk\" to use chan_lcr as remote application."},
 
 	{NULL, NULL, NULL, NULL}
 };
@@ -1059,9 +1288,7 @@ struct interface *read_interfaces(void)
 	}
 
 	line=0;
-	while((fgets(buffer,sizeof(buffer),fp))) {
-		buffer[sizeof(buffer)-1]=0;
-		if (buffer[0]) buffer[strlen(buffer)-1]=0;
+	while((GETLINE(buffer, fp))) {
 		p=buffer;
 		line++;
 
@@ -1248,16 +1475,19 @@ static void set_defaults(struct interface_port *ifport)
 		default_out_channel(ifport);
 	if (!ifport->in_channel)
 		default_in_channel(ifport);
+	/* must force the channel on PTMP/NT ports */
+	if (!ifport->mISDNport->ptp && ifport->mISDNport->ntmode)
+		ifport->channel_force = 1;
 	/* default is_tones */
 	if (ifport->interface->is_tones)
 		ifport->mISDNport->tones = (ifport->interface->is_tones==IS_YES);
 	else
-		ifport->mISDNport->tones = (ifport->mISDNport->ntmode)?1:0;
+		ifport->mISDNport->tones = (ifport->mISDNport->ntmode || ifport->mISDNport->ss5)?1:0;
 	/* default is_earlyb */
 	if (ifport->interface->is_earlyb)
 		ifport->mISDNport->earlyb = (ifport->interface->is_earlyb==IS_YES);
 	else
-		ifport->mISDNport->earlyb = (ifport->mISDNport->ntmode)?0:1;
+		ifport->mISDNport->earlyb = (ifport->mISDNport->ntmode && !ifport->mISDNport->ss5)?0:1;
 	/* set locally flag */
 	if (ifport->interface->extension)
 		ifport->mISDNport->locally = 1;
@@ -1294,7 +1524,7 @@ void relink_interfaces(void)
 				if (!strcmp(mISDNport->name, ifport->portname))
 					ifport->portnum = mISDNport->portnum; /* same name, so we use same number */
 				if (mISDNport->portnum == ifport->portnum) {
-					PDEBUG(DEBUG_ISDN, "Port %d:%s relinking!\n", mISDNport->portnum);
+					PDEBUG(DEBUG_ISDN, "Port %d:%s relinking!\n", ifport->portnum, ifport->portname);
 					ifport->mISDNport = mISDNport;
 					mISDNport->ifport = ifport;
 					set_defaults(ifport);
@@ -1313,6 +1543,10 @@ void relink_interfaces(void)
 		if (mISDNport->ifport == NULL) {
 			PDEBUG(DEBUG_ISDN, "Port %d is not used anymore and will be closed\n", mISDNport->portnum);
 			/* remove all port objects and destroy port */
+#ifdef WITH_GSM_MS
+			if (ifport->gsm_ms)
+				gsm_ms_delete(ifport->gsm_ms_name);
+#endif
 			mISDNport_close(mISDNport);
 			goto closeagain;
 		}
@@ -1343,7 +1577,7 @@ void load_port(struct interface_port *ifport)
 	struct mISDNport *mISDNport;
 
 	/* open new port */
-	mISDNport = mISDNport_open(ifport->portnum, ifport->portname, ifport->ptp, ifport->nt, ifport->tespecial, ifport->l1hold, ifport->l2hold, ifport->interface, ifport->gsm);
+	mISDNport = mISDNport_open(ifport);
 	if (mISDNport) {
 		/* link port */
 		ifport->mISDNport = mISDNport;
@@ -1353,6 +1587,12 @@ void load_port(struct interface_port *ifport)
 		SCPY(ifport->portname, mISDNport->name);
 		/* set defaults */
 		set_defaults(ifport);
+		/* load static port instances */
+		mISDNport_static(mISDNport);
+#ifdef WITH_GSM_MS
+		if (ifport->gsm_ms)
+			gsm_ms_new(ifport->gsm_ms_name, ifport->gsm_ms_socket);
+#endif
 	} else {
 		ifport->block = 2; /* not available */
 	}