X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=interface.c;h=4f7e40a966e20c4d26e3de9f99d55a3e499db75a;hp=cbfed2e8078c46d10a1c583cdfbf09ccafc49a5c;hb=58afedec93e67db3600e2251d922fa3a4dbd7254;hpb=57a91e52d4ec8ace01206ecb78d597a8be2561fb

diff --git a/interface.c b/interface.c
index cbfed2e..4f7e40a 100644
--- a/interface.c
+++ b/interface.c
@@ -15,6 +15,7 @@ struct interface *interface_first = NULL; /* first interface is current list */
 struct interface *interface_newlist = NULL; /* first interface in new list */
 
 
+#ifdef WITH_MISDN
 /* set default out_channel */
 void default_out_channel(struct interface_port *ifport)
 {
@@ -22,7 +23,7 @@ void default_out_channel(struct interface_port *ifport)
 
 	selchannel = (struct select_channel *)MALLOC(sizeof(struct select_channel));
 	memuse++;
-	
+
 	if (ifport->mISDNport->ntmode)
 		selchannel->channel = CHANNEL_FREE;
 	else
@@ -53,6 +54,7 @@ void default_in_channel(struct interface_port *ifport)
 	
 	ifport->in_channel = selchannel;
 }
+#endif
 
 
 /* parse string for a positive number */
@@ -278,6 +280,10 @@ static int inter_port(struct interface *interface, char *filename, int line, cha
 }
 static int inter_portnum(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
+#ifndef WITH_MISDN
+	SPRINT(interface_error, "Error in %s (line %d): mISDN support is not compiled in.\n", filename, line);
+	return(-1);
+#else
 	struct interface_port *ifport, **ifportp;
 	struct interface *searchif;
 	int val;
@@ -312,9 +318,14 @@ static int inter_portnum(struct interface *interface, char *filename, int line,
 		ifportp = &((*ifportp)->next);
 	*ifportp = ifport;
 	return(0);
+#endif
 }
 static int inter_portname(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
+#ifndef WITH_MISDN
+	SPRINT(interface_error, "Error in %s (line %d): mISDN support is not compiled in.\n", filename, line);
+	return(-1);
+#else
 	struct interface_port *ifport, **ifportp;
 	struct interface *searchif;
 
@@ -354,6 +365,7 @@ static int inter_portname(struct interface *interface, char *filename, int line,
 		ifportp = &((*ifportp)->next);
 	*ifportp = ifport;
 	return(0);
+#endif
 }
 static int inter_l1hold(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
@@ -894,31 +906,19 @@ static int inter_gsm_bs(struct interface *interface, char *filename, int line, c
 	SPRINT(interface_error, "Error in %s (line %d): GSM BS side not compiled in.\n", filename, line);
 	return(-1);
 #else
-	struct interface_port *ifport;
 	struct interface *searchif;
 
 	searchif = interface_newlist;
 	while(searchif) {
-		ifport = searchif->ifport;
-		while(ifport) {
-			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;
+		if (searchif->gsm_bs) {
+			SPRINT(interface_error, "Error in %s (line %d): interface '%s' already uses gsm BS side.\n", filename, line, searchif->name);
+			return(-1);
 		}
 		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 gsmflag */
-	ifport = interface->ifport;
-	while(ifport->next)
-		ifport = ifport->next;
-	ifport->gsm_bs = 1;
+	interface->gsm_bs = 1;
 
 	return(0);
 #endif
@@ -929,37 +929,23 @@ static int inter_gsm_ms(struct interface *interface, char *filename, int line, c
 	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;
 
-	/* 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;
+	interface->gsm_ms = 1;
 
 	/* copy values */
 	if (!value || !value[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, value);
+	SCPY(interface->gsm_ms_name, value);
 
 	/* check if name is used multiple times */
 	searchif = interface_newlist;
 	while(searchif) {
-		searchifport = searchif->ifport;
-		while(searchifport) {
-			if (searchifport != ifport 
-			 && !strcmp(searchifport->gsm_ms_name, ifport->gsm_ms_name)) {
-				SPRINT(interface_error, "Error in %s (line %d): mobile '%s' already uses the given MS name '%s', choose a different one.\n", filename, line, ifport->gsm_ms_name, searchifport->gsm_ms_name);
-				return(-1);
-			}
-			searchifport = searchifport->next;
+		if (!strcmp(searchif->gsm_ms_name, interface->gsm_ms_name)) {
+			SPRINT(interface_error, "Error in %s (line %d): mobile '%s' already uses the given MS name '%s', choose a different one.\n", filename, line, interface->gsm_ms_name, searchif->gsm_ms_name);
+			return(-1);
 		}
 		searchif = searchif->next;
 	}
@@ -967,6 +953,81 @@ static int inter_gsm_ms(struct interface *interface, char *filename, int line, c
 	return(0);
 #endif
 }
+static int inter_sip(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+#ifndef WITH_SIP
+	SPRINT(interface_error, "Error in %s (line %d): SIP not compiled in.\n", filename, line);
+	return(-1);
+#else
+	char *p;
+
+	interface->sip = 1;
+
+	/* copy values */
+	if (!value || !value[0]) {
+		SPRINT(interface_error, "Error in %s (line %d): Missing SIP local IP.\n", filename, line);
+		return(-1);
+	}
+	p = get_seperated(value);
+	if (!p[0]) {
+		SPRINT(interface_error, "Error in %s (line %d): Missing SIP remote IP.\n", filename, line);
+		return(-1);
+	}
+	SCPY(interface->sip_local_peer, value);
+	SCPY(interface->sip_remote_peer, p);
+
+	return(0);
+#endif
+}
+static int inter_rtp_bridge(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+	int supported = 0;
+
+#ifdef WITH_GSM_BS
+	if (interface->gsm_bs)
+		supported = 1;
+#endif
+#ifdef WITH_SIP
+	if (interface->sip)
+		supported = 1;
+#endif
+	if (!supported) {
+		SPRINT(interface_error, "Error in %s (line %d): Interface does not support RTP\n", filename, line);
+		return(-1);
+	}
+	interface->rtp_bridge = 1;
+
+	return(0);
+}
+#if 0
+static int inter_rtp_payload(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
+	if (!interface->gsm_bs) {
+		SPRINT(interface_error, "Error in %s (line %d): This parameter only works for GSM BS side interface\n", filename, line);
+		return(-1);
+	}
+	if (!interface->rtp_bridge) {
+		SPRINT(interface_error, "Error in %s (line %d): This parameter only works here, if RTP bridging is enabled\n", filename, line);
+		return(-1);
+	}
+	if (!value[0]) {
+		SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects one payload type\n", filename, line, parameter);
+		return(-1);
+	}
+	if (interface->gsm_bs_payloads == sizeof(interface->gsm_bs_payload_types)) {
+		SPRINT(interface_error, "Error in %s (line %d): Too many payload types defined\n", filename, line);
+		return(-1);
+	}
+	interface->gsm_bs_payload_types[interface->gsm_bs_payloads++] = atoi(value);
+
+	return(0);
+#endif
+}
+#endif
 static int inter_nonotify(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
 	struct interface_port *ifport;
@@ -1066,16 +1127,25 @@ static int inter_remote(struct interface *interface, char *filename, int line, c
 	ifport->remote = 1;
 	SCPY(ifport->remote_app, value);
 
-
 	return(0);
 }
-
 static int inter_shutdown(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
 	interface->shutdown = 1;
 
 	return(0);
 }
+static int inter_bridge(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+	if (!value || !value[0]) {
+		SPRINT(interface_error, "Error in %s (line %d): Missing destination interface name.\n", filename, line);
+		return(-1);
+	}
+	interface->app = EAPP_TYPE_BRIDGE;
+	SCPY(interface->bridge_if, value);
+
+	return(0);
+}
 
 
 /*
@@ -1208,18 +1278,33 @@ struct interface_param interface_param[] = {
 	{"gsm", &inter_gsm, "",
 	""},
 	{"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 base station interface for using OpenBSC."},
+	{"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."},
+	{"sip", &inter_sip, "<local IP> <remote IP>",
+	"Sets up SIP interface that represents one SIP endpoint.\n"
+	"Give SIP configuration file."},
+	{"rtp-bridge", &inter_rtp_bridge, "",
+	"Enables RTP bridging directly from this interface.\n"
+	"This only works, if both ends support RTP. (like gsm-bs and sip)"},
+#if 0
+	not needed, since ms defines what is supports and remote (sip) tells what is selected
+	{"rtp-payload", &inter_rtp_payload, "<codec>",
+	"Define RTP payload to use. Only valid in conjuntion with gsm-bs!\n"
+	"If multiple payloads are defined, the first has highest priority.\n"
+	"If none are defined, GSM fullrate V1 (type 3) is assumed.\n"},
+#endif
 	{"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."},
+	{"bridge", &inter_bridge, "<destination interface>",
+	"Define bridge application for this interface. All calls received on this\n"
+	"interface will be directly bridged to the given destination interface.\n"
+	"There will be no PBX application, nor routing."},
 
 #ifdef WITH_SS5
 	{"ccitt5", &inter_ss5, "[<feature> [feature ...]]",
@@ -1454,10 +1539,11 @@ void free_interfaces(struct interface *interface)
 	}
 }
 
+#ifdef WITH_MISDN
 /*
  * defaults of ports if not specified by config
  */
-static void set_defaults(struct interface_port *ifport)
+static void set_mISDN_defaults(struct interface_port *ifport)
 {
 	/* default channel selection list */
 	if (!ifport->out_channel)
@@ -1483,6 +1569,7 @@ static void set_defaults(struct interface_port *ifport)
 	else
 		ifport->mISDNport->locally = 0;
 }
+#endif
 
 
 /*
@@ -1492,24 +1579,69 @@ static void set_defaults(struct interface_port *ifport)
  */
 void relink_interfaces(void)
 {
+#ifdef WITH_MISDN
 	struct mISDNport *mISDNport;
-	struct interface *interface;
 	struct interface_port *ifport;
+#endif
+	struct interface *interface, *temp;
+	int found;
 
-	/* unlink all mISDNports */
-	mISDNport = mISDNport_first;
-	while(mISDNport) {
-		if (mISDNport->ifport) {
-			ifport = mISDNport->ifport;
+	interface = interface_first;
+	while(interface) {
+		found = 0;
+		temp = interface_newlist;
+		while(temp) {
+			if (!strcmp(temp->name, interface->name))
+				found = 1;
+			temp = temp->next;
+		}
+		if (!found) {
 #ifdef WITH_GSM_MS
-			if (ifport->gsm_ms)
-				gsm_ms_delete(ifport->gsm_ms_name);
+			if (interface->gsm_ms)
+				gsm_ms_delete(interface->gsm_ms_name);
 #endif
 #ifdef WITH_GSM_BS
-			if (ifport->gsm_bs)
+			if (interface->gsm_bs)
 				gsm_bs_exit(0);
 #endif
+#ifdef WITH_SIP
+			if (interface->sip)
+				sip_exit_inst(interface);
+#endif
 		}
+		interface = interface->next;
+	}
+
+	interface = interface_newlist;
+	while(interface) {
+		found = 0;
+		temp = interface_first;
+		while(temp) {
+			if (!strcmp(temp->name, interface->name))
+				found = 1;
+			temp = temp->next;
+		}
+		if (!found) {
+#ifdef WITH_GSM_MS
+			if (interface->gsm_ms)
+				gsm_ms_new(interface);
+#endif
+#ifdef WITH_GSM_BS
+			if (interface->gsm_bs)
+				gsm_bs_init(interface);
+#endif
+#ifdef WITH_SIP
+			if (interface->sip)
+				sip_init_inst(interface);
+#endif
+		}
+		interface = interface->next;
+	}
+
+#ifdef WITH_MISDN
+	/* unlink all mISDNports */
+	mISDNport = mISDNport_first;
+	while(mISDNport) {
 		mISDNport->ifport = NULL;
 		mISDNport = mISDNport->next;
 	}
@@ -1527,7 +1659,7 @@ void relink_interfaces(void)
 					PDEBUG(DEBUG_ISDN, "Port %d:%s relinking!\n", ifport->portnum, ifport->portname);
 					ifport->mISDNport = mISDNport;
 					mISDNport->ifport = ifport;
-					set_defaults(ifport);
+					set_mISDN_defaults(ifport);
 				}
 				mISDNport = mISDNport->next;
 			}
@@ -1556,7 +1688,7 @@ void relink_interfaces(void)
 		while(ifport) {
 			if (!ifport->mISDNport) {
 				if (!interface->shutdown) {
-					load_port(ifport);
+					load_mISDN_port(ifport);
 				} else {
 					ifport->block = 2;
 				}
@@ -1565,14 +1697,15 @@ void relink_interfaces(void)
 		}
 		interface = interface->next;
 	}
-
+#endif
 }
 
 
+#ifdef WITH_MISDN
 /*
  * load port
  */
-void load_port(struct interface_port *ifport)
+void load_mISDN_port(struct interface_port *ifport)
 {
 	struct mISDNport *mISDNport;
 
@@ -1586,21 +1719,14 @@ void load_port(struct interface_port *ifport)
 		ifport->portnum = mISDNport->portnum;
 		SCPY(ifport->portname, mISDNport->name);
 		/* set defaults */
-		set_defaults(ifport);
+		set_mISDN_defaults(ifport);
 		/* load static port instances */
 		mISDNport_static(mISDNport);
-#ifdef WITH_GSM_MS
-		if (ifport->gsm_ms)
-			gsm_ms_new(ifport->gsm_ms_name);
-#endif
-#ifdef WITH_GSM_BS
-		if (ifport->gsm_bs)
-			gsm_bs_init();
-#endif
 	} else {
 		ifport->block = 2; /* not available */
 	}
 }
+#endif
 
 /*
  * give summary of interface syntax
@@ -1634,12 +1760,17 @@ void doc_interface(void)
 /* screen caller id
  * out==0: incoming caller id, out==1: outgoing caller id
  */
-void do_screen(int out, char *id, int idsize, int *type, int *present, struct interface *interface)
+void do_screen(int out, char *id, int idsize, int *type, int *present, const char *interface_name)
 {
 	char			*msn1;
 	struct interface_msn	*ifmsn;
 	struct interface_screen	*ifscreen;
 	char suffix[64];
+	struct interface *interface = interface_first;
+
+	interface = getinterfacebyname(interface_name);
+	if (!interface)
+		return;
 
 	/* screen incoming caller id */
 	if (!out) {
@@ -1764,3 +1895,16 @@ void do_screen(int out, char *id, int idsize, int *type, int *present, struct in
 	}
 }
 
+struct interface *getinterfacebyname(const char *name)
+{
+	struct interface *interface = interface_first;
+
+	while (interface) {
+		if (!strcmp(interface->name, name))
+			return interface;
+		interface = interface->next;
+	}
+
+	return NULL;
+}
+