X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=interface.c;h=a4bac2d8066356868a4f4cdebb9a482a0ff80736;hp=42f409c25e016682c02c08a66073ebf94664ce0e;hb=51655a18970b6117e6102f6ca7541b53fb6f568e;hpb=323cbc387b1a068f8e2bcfd1034666406ba18c93

diff --git a/interface.c b/interface.c
index 42f409c..a4bac2d 100644
--- a/interface.c
+++ b/interface.c
@@ -916,6 +916,22 @@ static int inter_gsm(struct interface *interface, char *filename, int line, char
 	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)
 {
@@ -1097,7 +1113,12 @@ struct interface_param interface_param[] = {
 	{"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"},
+	"must be assigned to OpenBSC."},
+
+	{"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 ...]]",
@@ -1148,9 +1169,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++;
 
@@ -1383,7 +1402,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);
@@ -1432,7 +1451,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, ifport->ss5);
+	mISDNport = mISDNport_open(ifport);
 	if (mISDNport) {
 		/* link port */
 		ifport->mISDNport = mISDNport;