X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=interface.c;h=365e8436271abacd8e208a9562246b8cce3801ca;hp=89aa5827cd3bd4eda033723d7121f620c8087431;hb=f854931ffbee9464b278c433c4fdc7c3ea5af2fb;hpb=74a7fe54a81bb7e996ea45203bbc8cc0ff6b8dda

diff --git a/interface.c b/interface.c
index 89aa582..365e843 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)
 {
@@ -969,10 +981,53 @@ static int inter_sip(struct interface *interface, char *filename, int line, char
 }
 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;
@@ -1233,8 +1288,15 @@ struct interface_param interface_param[] = {
 	"Sets up SIP interface that represents one SIP endpoint.\n"
 	"Give SIP configuration file."},
 	{"rtp-bridge", &inter_rtp_bridge, "",
-	"Sets up SIP interface that represents one SIP endpoint.\n"
-	"Give SIP configuration file."},
+	"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"
@@ -1477,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)
@@ -1506,6 +1569,7 @@ static void set_defaults(struct interface_port *ifport)
 	else
 		ifport->mISDNport->locally = 0;
 }
+#endif
 
 
 /*
@@ -1515,9 +1579,11 @@ static void set_defaults(struct interface_port *ifport)
  */
 void relink_interfaces(void)
 {
+#ifdef WITH_MISDN
 	struct mISDNport *mISDNport;
-	struct interface *interface, *temp;
 	struct interface_port *ifport;
+#endif
+	struct interface *interface, *temp;
 	int found;
 
 	interface = interface_first;
@@ -1572,6 +1638,7 @@ void relink_interfaces(void)
 		interface = interface->next;
 	}
 
+#ifdef WITH_MISDN
 	/* unlink all mISDNports */
 	mISDNport = mISDNport_first;
 	while(mISDNport) {
@@ -1592,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;
 			}
@@ -1621,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;
 				}
@@ -1630,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;
 
@@ -1651,13 +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);
 	} else {
 		ifport->block = 2; /* not available */
 	}
 }
+#endif
 
 /*
  * give summary of interface syntax
@@ -1699,11 +1768,7 @@ void do_screen(int out, char *id, int idsize, int *type, int *present, const cha
 	char suffix[64];
 	struct interface *interface = interface_first;
 
-	while (interface) {
-		if (!strcmp(interface->name, interface_name))
-			break;
-		interface = interface->next;
-	}
+	interface = getinterfacebyname(interface_name);
 	if (!interface)
 		return;
 
@@ -1830,3 +1895,16 @@ void do_screen(int out, char *id, int idsize, int *type, int *present, const cha
 	}
 }
 
+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;
+}
+