X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=b53d5cec25c2ef85c14d71bdce2c49bb71914c97;hp=aaa02cb1ac16a99877e7e897c6715d41d3b8ed26;hb=30224b43e26f8b942da6770ac57eb3e17fcb259e;hpb=3a8f58ec8946b7f1683208d1cc3b054486f12e6c

diff --git a/apppbx.cpp b/apppbx.cpp
index aaa02cb..b53d5ce 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -26,12 +26,14 @@ int callback_timeout(struct lcr_timer *timer, void *instance, int index);
 /*
  * EndpointAppPBX constructor
  */
-EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint, int origin) : EndpointApp(epoint, origin)
+EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint, int origin) : EndpointApp(epoint, origin, EAPP_TYPE_PBX)
 {
 	class EndpointAppPBX **apppointer;
 
+#ifdef WITH_CRYPT
 	memset(&e_crypt_handler, 0, sizeof(e_crypt_handler));
 	add_timer(&e_crypt_handler, crypt_handler, this, 0);
+#endif
 	memset(&e_vbox_refresh, 0, sizeof(e_vbox_refresh));
 	add_timer(&e_vbox_refresh, vbox_refresh, this, 0);
 	memset(&e_action_timeout, 0, sizeof(e_action_timeout));
@@ -72,6 +74,7 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint, int origin) : EndpointApp
         memset(&e_connectinfo, 0, sizeof(struct connect_info));
         memset(&e_redirinfo, 0, sizeof(struct redir_info));
         memset(&e_capainfo, 0, sizeof(struct capa_info));
+        memset(&e_rtpinfo, 0, sizeof(struct rtp_info));
         e_start = e_stop = 0;
 	e_origin = origin;
 	e_ruleset = ruleset_main;
@@ -103,10 +106,12 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint, int origin) : EndpointApp
 	e_multipoint_cause = 0;
 	e_multipoint_location = 0;
 	e_dialing_queue[0] = '\0';
+#ifdef WITH_CRYPT
 	e_crypt = CRYPT_OFF;
 	e_crypt_state = CM_ST_NULL;
 	e_crypt_keyengine_busy = 0;
-	e_crypt_info[0] = '\0'; 
+	e_crypt_info[0] = '\0';
+#endif
 	e_overlap = 0;
 	e_vbox[0] = '\0';
 	e_tx_state = NOTIFY_STATE_ACTIVE;
@@ -130,7 +135,9 @@ EndpointAppPBX::~EndpointAppPBX(void)
 {
 	class EndpointAppPBX *temp, **tempp;
 
+#ifdef WITH_CRYPT
 	del_timer(&e_crypt_handler);
+#endif
 	del_timer(&e_vbox_refresh);
 	del_timer(&e_action_timeout);
 	del_timer(&e_match_timeout);
@@ -271,10 +278,12 @@ void EndpointAppPBX::release(int release, int joinlocation, int joincause, int p
 			e_multipoint_cause = 0;
 			e_multipoint_location = 0;
 			e_dialing_queue[0] = '\0';
+#ifdef WITH_CRYPT
 			e_crypt = 0;
 			e_crypt_state = CM_ST_NULL;
 			e_crypt_keyengine_busy = 0;
 			e_crypt_info[0] = '\0'; 
+#endif
 			e_tone[0] = '\0';
 			e_overlap = 0;
 			e_vbox[0] = '\0';
@@ -509,6 +518,7 @@ void EndpointAppPBX::keypad_function(char digit)
 		join_join();
 		break;
 
+#ifdef WITH_CRYPT
 		/* crypt shared */
 		case '7':
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) shared key encryption selected.\n", ea_endpoint->ep_serial);
@@ -526,6 +536,7 @@ void EndpointAppPBX::keypad_function(char digit)
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) encryption off selected.\n", ea_endpoint->ep_serial);
 		encrypt_off();
 		break;
+#endif
 
 		default:	
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) unsupported keypad digit '%c'.\n", ea_endpoint->ep_serial, digit);
@@ -574,257 +585,6 @@ void EndpointAppPBX::set_tone(struct port_list *portlist, const char *tone)
 }
 
 
-/*
- * hunts an mISDNport that is available for an outgoing call
- * if no ifname was given, any interface that is not an extension
- * will be searched.
- */
-struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
-{
-	struct interface *interface;
-	struct interface_port *ifport, *ifport_start;
-	struct select_channel *selchannel; 
-	struct mISDNport *mISDNport;
-	int index, i;
-	int there_is_an_external = 0;
-
-	interface = interface_first;
-
-	/* first find the given interface or, if not given, one with no extension */
-	checknext:
-	if (!interface) {
-		if (!there_is_an_external && !(ifname && ifname[0])) {
-			trace_header("CHANNEL SELECTION (no external interface specified)", DIRECTION_NONE);
-			add_trace("info", NULL, "Add 'extern' parameter to interface.conf.");
-			end_trace();
-		}
-		return(NULL);
-	}
-
-	/* check for given interface */
-	if (ifname && ifname[0]) {
-		if (!strcasecmp(interface->name, ifname)) {
-			/* found explicit interface */
-			trace_header("CHANNEL SELECTION (found given interface)", DIRECTION_NONE);
-			add_trace("interface", NULL, "%s", ifname);
-			end_trace();
-			goto foundif;
-		}
-
-	} else {
-		if (interface->external) {
-			there_is_an_external = 1;
-			/* found non extension */
-			trace_header("CHANNEL SELECTION (found external interface)", DIRECTION_NONE);
-			add_trace("interface", NULL, "%s", interface->name);
-			end_trace();
-			goto foundif;
-		}
-	}
-
-	interface = interface->next;
-	goto checknext;
-foundif:
-
-	/* see if interface has ports */
-	if (!interface->ifport) {
-		/* no ports */
-		trace_header("CHANNEL SELECTION (active ports, skipping)", DIRECTION_NONE);
-		add_trace("interface", NULL, "%s", interface->name);
-		end_trace();
-		interface = interface->next;
-		goto checknext;
-	}
-
-	/* select port by algorithm */
-	ifport_start = interface->ifport;
-	index = 0;
-	if (interface->hunt == HUNT_ROUNDROBIN) {
-		while(ifport_start->next && index<interface->hunt_next) {
-			ifport_start = ifport_start->next;
-			index++;
-		}
-		trace_header("CHANNEL SELECTION (starting round-robin)", DIRECTION_NONE);
-		add_trace("port", NULL, "%d", ifport_start->portnum);
-		add_trace("position", NULL, "%d", index);
-		end_trace();
-	}
-
-	/* loop ports */
-	ifport = ifport_start;
-	nextport:
-
-	/* see if port is available */
-	if (!ifport->mISDNport) {
-		trace_header("CHANNEL SELECTION (port not available, skipping)", DIRECTION_NONE);
-		add_trace("port", NULL, "%d", ifport->portnum);
-		add_trace("position", NULL, "%d", index);
-		end_trace();
-		goto portbusy;
-	}
-	mISDNport = ifport->mISDNport;
-
-	/* see if port is administratively blocked */
-	if (ifport->block) {
-		trace_header("CHANNEL SELECTION (port blocked by admin, skipping)", DIRECTION_NONE);
-		add_trace("port", NULL, "%d", ifport->portnum);
-		add_trace("position", NULL, "%d", index);
-		end_trace();
-		goto portbusy;
-	}
-
-	/* see if link is up on PTP*/
-	if (mISDNport->l2hold && mISDNport->l2link<1) {
-		trace_header("CHANNEL SELECTION (port's layer 2 is down, skipping)", DIRECTION_NONE);
-		add_trace("port", NULL, "%d", ifport->portnum);
-		add_trace("position", NULL, "%d", index);
-		end_trace();
-		goto portbusy;
-	}
-
-	/* check for channel form selection list */
-	*channel = 0;
-#ifdef WITH_SS5
-	if (mISDNport->ss5) {
-		class Pss5 *port;
-		port = ss5_hunt_line(mISDNport);
-		if (port) {
-			*channel = port->p_m_b_channel;
-			trace_header("CHANNEL SELECTION (selecting SS5 channel)", DIRECTION_NONE);
-			add_trace("port", NULL, "%d", ifport->portnum);
-			add_trace("position", NULL, "%d", index);
-			add_trace("channel", NULL, "%d", *channel);
-			end_trace();
-		}
-	} else
-#endif
-	{
-		selchannel = ifport->out_channel;
-		while(selchannel) {
-			switch(selchannel->channel) {
-				case CHANNEL_FREE: /* free channel */
-				if (mISDNport->b_reserved >= mISDNport->b_num)
-					break; /* all channel in use or reserverd */
-				/* find channel */
-				i = 0;
-				while(i < mISDNport->b_num) {
-					if (mISDNport->b_port[i] == NULL) {
-						*channel = i+1+(i>=15);
-						trace_header("CHANNEL SELECTION (selecting free channel)", DIRECTION_NONE);
-						add_trace("port", NULL, "%d", ifport->portnum);
-						add_trace("position", NULL, "%d", index);
-						add_trace("channel", NULL, "%d", *channel);
-						end_trace();
-						break;
-					}
-					i++;
-				}
-				if (*channel)
-					break;
-				trace_header("CHANNEL SELECTION (no channel is 'free')", DIRECTION_NONE);
-				add_trace("port", NULL, "%d", ifport->portnum);
-				add_trace("position", NULL, "%d", index);
-				end_trace();
-				break;
-
-				case CHANNEL_ANY: /* don't ask for channel */
-				if (mISDNport->b_reserved >= mISDNport->b_num) {
-					trace_header("CHANNEL SELECTION (cannot ask for 'any' channel, all reserved)", DIRECTION_NONE);
-					add_trace("port", NULL, "%d", ifport->portnum);
-					add_trace("position", NULL, "%d", index);
-					add_trace("total", NULL, "%d", mISDNport->b_num);
-					add_trace("reserved", NULL, "%d", mISDNport->b_reserved);
-					end_trace();
-					break; /* all channel in use or reserverd */
-				}
-				trace_header("CHANNEL SELECTION (using 'any' channel)", DIRECTION_NONE);
-				add_trace("port", NULL, "%d", ifport->portnum);
-				add_trace("position", NULL, "%d", index);
-				end_trace();
-				*channel = CHANNEL_ANY;
-				break;
-
-				case CHANNEL_NO: /* call waiting */
-				trace_header("CHANNEL SELECTION (using 'no' channel, call-waiting)", DIRECTION_NONE);
-				add_trace("port", NULL, "%d", ifport->portnum);
-				add_trace("position", NULL, "%d", index);
-				end_trace();
-				*channel = CHANNEL_NO;
-				break;
-
-				default:
-				if (selchannel->channel<1 || selchannel->channel==16) {
-					trace_header("CHANNEL SELECTION (channel out of range)", DIRECTION_NONE);
-					add_trace("port", NULL, "%d", ifport->portnum);
-					add_trace("position", NULL, "%d", index);
-					add_trace("channel", NULL, "%d", selchannel->channel);
-					end_trace();
-					break; /* invalid channels */
-				}
-				i = selchannel->channel-1-(selchannel->channel>=17);
-				if (i >= mISDNport->b_num) {
-					trace_header("CHANNEL SELECTION (channel out of range)", DIRECTION_NONE);
-					add_trace("port", NULL, "%d", ifport->portnum);
-					add_trace("position", NULL, "%d", index);
-					add_trace("channel", NULL, "%d", selchannel->channel);
-					add_trace("channels", NULL, "%d", mISDNport->b_num);
-					end_trace();
-					break; /* channel not in port */
-				}
-				if (mISDNport->b_port[i] == NULL) {
-					*channel = selchannel->channel;
-					trace_header("CHANNEL SELECTION (selecting given channel)", DIRECTION_NONE);
-					add_trace("port", NULL, "%d", ifport->portnum);
-					add_trace("position", NULL, "%d", index);
-					add_trace("channel", NULL, "%d", *channel);
-					end_trace();
-					break;
-				}
-				break;
-			}
-			if (*channel)
-				break; /* found channel */
-			selchannel = selchannel->next;
-		}
-	}
-
-	/* if channel was found, return mISDNport and channel */
-	if (*channel) {
-		/* setting next port to start next time */
-		if (interface->hunt == HUNT_ROUNDROBIN) {
-			index++;
-			if (!ifport->next)
-				index = 0;
-			interface->hunt_next = index;
-		}
-		
-		return(mISDNport);
-	}
-
-	trace_header("CHANNEL SELECTION (skipping, no channel found)", DIRECTION_NONE);
-	add_trace("port", NULL, "%d", ifport->portnum);
-	add_trace("position", NULL, "%d", index);
-	end_trace();
-
-	portbusy:
-	/* go next port, until all ports are checked */
-	index++;
-	ifport = ifport->next;
-	if (!ifport) {
-		index = 0;
-		ifport = interface->ifport;
-	}
-	if (ifport != ifport_start)
-		goto nextport;
-
-	if (!ifname) {
-		interface = interface->next;
-		goto checknext;
-	}
-
-	return(NULL); /* no port found */
-}
-
 /* outgoing setup to port(s)
  * ports will be created and a setup is sent if everything is ok. otherwhise
  * the endpoint is destroyed.
@@ -839,19 +599,26 @@ void EndpointAppPBX::out_setup(int cfnr)
 	int			cause = CAUSE_RESSOURCEUNAVAIL;
 	const char		*p;
 	char			cfp[64];
+	struct interface	*interface;
+#ifdef WITH_MISDN
 	struct mISDNport	*mISDNport;
+#endif
 	char			portname[32];
 	char			*dirname;
 	class EndpointAppPBX	*atemp;
 //	char			allowed_ports[256];
 //	char			exten[256];
 	char			ifname[sizeof(e_ext.interfaces)],
-				number[256];
+				*ifname_p,
+				number[256],
+				*number_p;
 	struct port_settings	port_settings;
+#ifdef WITH_MISDN
 	int			channel = 0;
+#endif
+	struct admin_list	*admin;
 	int			earlyb;
 	int			mode = B_MODE_TRANSPARENT;
-	struct admin_list	*admin;
 
 	/* set bchannel mode */
 	mode = e_capainfo.source_mode;
@@ -957,55 +724,87 @@ void EndpointAppPBX::out_setup(int cfnr)
 		p = e_ext.interfaces;
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) generating multiple joins for extension %s to interfaces %s\n", ea_endpoint->ep_serial, e_dialinginfo.id, p);
 		while(*p) {
+			earlyb = 0;
 			ifname[0] = '\0';
 			while(*p!=',' && *p!='\0')
 				if (*p > ' ')
 					SCCAT(ifname, *p++);
 			if (*p == ',')
 				p++;
-			/* found interface */
-			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) calling to interface %s\n", ea_endpoint->ep_serial, ifname);
-			/* hunt for mISDNport and create Port */
-			mISDNport = hunt_port(ifname, &channel);
-			if (!mISDNport) {
-				trace_header("INTERFACE (not found or busy)", DIRECTION_NONE);
+			/* search interface */
+			interface = hunt_interface(ifname);
+			if (!interface) {
+				trace_header("INTERFACE (not found)", DIRECTION_NONE);
 				add_trace("interface", NULL, "%s", ifname);
 				end_trace();
 				continue;
 			}
-			/* creating INTERNAL port */
-			SPRINT(portname, "%s-%d-out", mISDNport->ifport->interface->name, mISDNport->portnum);
-#ifdef WITH_SS5
-			if (mISDNport->ss5)
-				port = ss5_hunt_line(mISDNport);
-			else
-#endif
-#ifdef WITH_GSM_BS
-			if (mISDNport->gsm_bs)
-				port = new Pgsm_bs(PORT_TYPE_GSM_BS_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force, mode);
-			else
-#endif
-#ifdef WITH_GSM_MS
-			if (mISDNport->gsm_ms)
-				port = new Pgsm_ms(PORT_TYPE_GSM_MS_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force, mode);
-			else
-#endif
-			if (mISDNport->ifport->remote) {
+			/* found interface */
+			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) calling to interface %s\n", ea_endpoint->ep_serial, ifname);
+			if (interface->remote) {
 				admin = admin_first;
 				while(admin) {
-					if (admin->remote_name[0] && !strcmp(admin->remote_name, mISDNport->ifport->remote_app))
+					if (admin->remote_name[0] && !strcmp(admin->remote_name, interface->remote_app))
 						break;
 					admin = admin->next;
 				}
 				if (!admin) {
 					trace_header("INTERFACE (remote not connected)", DIRECTION_NONE);
-					add_trace("application", NULL, "%s", mISDNport->ifport->remote_app);
+					add_trace("application", NULL, "%s", interface->remote_app);
 					end_trace();
 					continue;
 				}
-				port = new Premote(PORT_TYPE_REMOTE_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force, mode, admin->sock);
+				SPRINT(portname, "%s-%d-out", interface->name, 0);
+				port = new Premote(PORT_TYPE_REMOTE_OUT, portname, &port_settings, interface, admin->sock);
+				earlyb = (interface->is_earlyb == IS_YES);
+			} else
+#ifdef WITH_GSM_BS
+			if (interface->gsm_bs) {
+				SPRINT(portname, "%s-%d-out", interface->name, 0);
+				port = new Pgsm_bs(PORT_TYPE_GSM_BS_OUT, portname, &port_settings, interface);
+				earlyb = (interface->is_earlyb == IS_YES);
+			} else
+#endif
+#ifdef WITH_GSM_MS
+			if (interface->gsm_ms) {
+				SPRINT(portname, "%s-%d-out", interface->name, 0);
+				port = new Pgsm_ms(PORT_TYPE_GSM_MS_OUT, portname, &port_settings, interface);
+				earlyb = (interface->is_earlyb == IS_YES);
+			} else
+#endif
+#ifdef WITH_SIP
+			if (interface->sip) {
+				SPRINT(portname, "%s-%d-out", interface->name, 0);
+				port = new Psip(PORT_TYPE_SIP_OUT, portname, &port_settings, interface);
+				earlyb = (interface->is_earlyb == IS_YES);
 			} else
+#endif
+			{
+#ifdef WITH_MISDN
+				/* hunt for mISDNport and create Port */
+				mISDNport = hunt_port(ifname, &channel);
+				if (!mISDNport) {
+					trace_header("INTERFACE (busy)", DIRECTION_NONE);
+					add_trace("interface", NULL, "%s", ifname);
+					end_trace();
+					continue;
+				}
+
+				SPRINT(portname, "%s-%d-out", mISDNport->ifport->interface->name, mISDNport->portnum);
+#ifdef WITH_SS5
+				if (mISDNport->ss5)
+					port = ss5_hunt_line(mISDNport);
+				else
+#endif
 				port = new Pdss1((mISDNport->ntmode)?PORT_TYPE_DSS1_NT_OUT:PORT_TYPE_DSS1_TE_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force, mode);
+				earlyb = mISDNport->earlyb;
+#else
+			trace_header("INTERFACE (has no function)", DIRECTION_NONE);
+			add_trace("interface", NULL, "%s", ifname);
+			end_trace();
+			continue;
+#endif
+			}
 			if (!port)
 				FATAL("Failed to create Port instance\n");
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) got port %s\n", ea_endpoint->ep_serial, port->p_name);
@@ -1014,7 +813,7 @@ void EndpointAppPBX::out_setup(int cfnr)
 			dialinginfo.itype = INFO_ITYPE_ISDN_EXTENSION;
 			dialinginfo.ntype = e_dialinginfo.ntype;
 			/* create port_list relation */
-			portlist = ea_endpoint->portlist_new(port->p_serial, port->p_type, mISDNport->earlyb);
+			portlist = ea_endpoint->portlist_new(port->p_serial, port->p_type, earlyb);
 			if (!portlist) {
 				PERROR("EPOINT(%d) cannot allocate port_list relation\n", ea_endpoint->ep_serial);
 				delete port;
@@ -1034,6 +833,7 @@ void EndpointAppPBX::out_setup(int cfnr)
 			memcpy(&message->param.setup.redirinfo, &e_redirinfo, sizeof(struct redir_info));
 			memcpy(&message->param.setup.callerinfo, &e_callerinfo, sizeof(struct caller_info));
 			memcpy(&message->param.setup.capainfo, &e_capainfo, sizeof(struct capa_info));
+			memcpy(&message->param.setup.rtpinfo, &e_rtpinfo, sizeof(struct rtp_info));
 //terminal			SCPY(message->param.setup.from_terminal, e_ext.number);
 //terminal			if (e_dialinginfo.id)
 //terminal				SCPY(message->param.setup.to_terminal, e_dialinginfo.id);
@@ -1106,6 +906,7 @@ void EndpointAppPBX::out_setup(int cfnr)
 					p++;
 				/* external call */
 				PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cfp external %s\n", ea_endpoint->ep_serial, cfp);
+#ifdef WITH_MISDN
 				/* hunt for mISDNport and create Port */
 				mISDNport = hunt_port(e_dialinginfo.interfaces[0]?e_dialinginfo.interfaces:NULL, &channel);
 				if (mISDNport) {
@@ -1120,7 +921,9 @@ void EndpointAppPBX::out_setup(int cfnr)
 					if (!port)
 						FATAL("No memory for Port instance\n");
 					earlyb = mISDNport->earlyb;
-				} else {
+				} else
+#endif
+				{
 					port = NULL;
 					trace_header("INTERFACE (too busy)", DIRECTION_NONE);
 					add_trace("interface", NULL, "%s", e_dialinginfo.interfaces[0]?e_dialinginfo.interfaces:"any interface");
@@ -1187,98 +990,148 @@ void EndpointAppPBX::out_setup(int cfnr)
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) dialing external: called='%s' keypad='%s'\n", ea_endpoint->ep_serial, e_dialinginfo.id, e_dialinginfo.keypad);
 		/* call to extenal interfaces */
 		if (e_dialinginfo.keypad[0])
-			p = e_dialinginfo.keypad;
+			number_p = e_dialinginfo.keypad;
 		else
-			p = e_dialinginfo.id;
+			number_p = e_dialinginfo.id;
 		do {
 			number[0] = '\0';
-			while(*p!=',' && *p!='\0')
-				SCCAT(number, *p++);
-			if (*p == ',')
-				p++;
+			while(*number_p!=',' && *number_p!='\0')
+				SCCAT(number, *number_p++);
+			if (*number_p == ',')
+				number_p++;
 			/* found number */
-			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) calling to number '%s' interface '%s'\n", ea_endpoint->ep_serial, number, e_dialinginfo.interfaces[0]?e_dialinginfo.interfaces:"any interface");
-			/* hunt for mISDNport and create Port */
-			/* hunt for mISDNport and create Port */
-			mISDNport = hunt_port(e_dialinginfo.interfaces[0]?e_dialinginfo.interfaces:NULL, &channel);
-			if (!mISDNport) {
-				trace_header("INTERFACE (too busy)", DIRECTION_NONE);
-				add_trace("interface", NULL, "%s", e_dialinginfo.interfaces[0]?e_dialinginfo.interfaces:"any interface");
-				end_trace();
-				goto check_anycall_extern;
-			}
-			/* creating EXTERNAL port*/
-			SPRINT(portname, "%s-%d-out", mISDNport->ifport->interface->name, mISDNport->portnum);
-#ifdef WITH_SS5
-			if (mISDNport->ss5)
-				port = ss5_hunt_line(mISDNport);
-			else
-#endif
+
+			ifname_p = e_dialinginfo.interfaces;
+			if (*ifname_p == '+')
+				ifname_p++;
+			do {
+				earlyb = 0;
+				ifname[0] = '\0';
+				while(*ifname_p!=',' && *ifname_p!='\0')
+					SCCAT(ifname, *ifname_p++);
+				if (*ifname_p == ',')
+					ifname_p++;
+				/* found interface name */
+
+				/* search interface */
+				PDEBUG(DEBUG_EPOINT, "EPOINT(%d) calling to number '%s' interface '%s'\n", ea_endpoint->ep_serial, number, ifname[0]?ifname:"any interface");
+				interface = hunt_interface(ifname[0]?ifname:NULL);
+				if (!interface) {
+					trace_header("INTERFACE (not found)", DIRECTION_NONE);
+					add_trace("interface", NULL, "%s", ifname);
+					end_trace();
+					continue;
+				}
+				/* found interface */
+				if (interface->remote) {
+					admin = admin_first;
+					while(admin) {
+						if (admin->remote_name[0] && !strcmp(admin->remote_name, interface->remote_app))
+							break;
+						admin = admin->next;
+					}
+					if (!admin) {
+						trace_header("INTERFACE (remote not connected)", DIRECTION_NONE);
+						add_trace("application", NULL, "%s", interface->remote_app);
+						end_trace();
+						continue;
+					}
+					SPRINT(portname, "%s-%d-out", interface->name, 0);
+					port = new Premote(PORT_TYPE_REMOTE_OUT, portname, &port_settings, interface, admin->sock);
+					earlyb = (interface->is_earlyb == IS_YES);
+				} else
 #ifdef WITH_GSM_BS
-			if (mISDNport->gsm_bs)
-				port = new Pgsm_bs(PORT_TYPE_GSM_BS_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force, mode);
-			else
+				if (interface->gsm_bs) {
+					SPRINT(portname, "%s-%d-out", interface->name, 0);
+					port = new Pgsm_bs(PORT_TYPE_GSM_BS_OUT, portname, &port_settings, interface);
+					earlyb = (interface->is_earlyb == IS_YES);
+				} else
 #endif
 #ifdef WITH_GSM_MS
-			if (mISDNport->gsm_ms)
-				port = new Pgsm_ms(PORT_TYPE_GSM_MS_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force, mode);
-			else
+				if (interface->gsm_ms) {
+					SPRINT(portname, "%s-%d-out", interface->name, 0);
+					port = new Pgsm_ms(PORT_TYPE_GSM_MS_OUT, portname, &port_settings, interface);
+					earlyb = (interface->is_earlyb == IS_YES);
+				} else
 #endif
-			if (mISDNport->ifport->remote) {
-				admin = admin_first;
-				while(admin) {
-					if (admin->remote_name[0] && !strcmp(admin->remote_name, mISDNport->ifport->remote_app))
-						break;
-					admin = admin->next;
-				}
-				if (!admin) {
-					trace_header("INTERFACE (remote not connected)", DIRECTION_NONE);
-					add_trace("application", NULL, "%s", mISDNport->ifport->remote_app);
+#ifdef WITH_SIP
+				if (interface->sip) {
+					SPRINT(portname, "%s-%d-out", interface->name, 0);
+					port = new Psip(PORT_TYPE_SIP_OUT, portname, &port_settings, interface);
+					earlyb = (interface->is_earlyb == IS_YES);
+				} else
+#endif
+				{
+#ifdef WITH_MISDN
+					/* hunt for mISDNport and create Port */
+					mISDNport = hunt_port(ifname[0]?ifname:NULL, &channel);
+					if (!mISDNport) {
+						trace_header("INTERFACE (too busy)", DIRECTION_NONE);
+						add_trace("interface", NULL, "%s", ifname[0]?ifname:"any interface");
+						end_trace();
+						continue;
+					}
+					/* creating EXTERNAL port*/
+					SPRINT(portname, "%s-%d-out", mISDNport->ifport->interface->name, mISDNport->portnum);
+
+#ifdef WITH_SS5
+					if (mISDNport->ss5)
+						port = ss5_hunt_line(mISDNport);
+					else
+#endif
+					port = new Pdss1((mISDNport->ntmode)?PORT_TYPE_DSS1_NT_OUT:PORT_TYPE_DSS1_TE_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force, mode);
+					earlyb = mISDNport->earlyb;
+#else
+					trace_header("INTERFACE (has no function)", DIRECTION_NONE);
+					add_trace("interface", NULL, "%s", ifname);
 					end_trace();
 					continue;
+#endif
 				}
-				port = new Premote(PORT_TYPE_REMOTE_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force, mode, admin->sock);
-			} else
-				port = new Pdss1((mISDNport->ntmode)?PORT_TYPE_DSS1_NT_OUT:PORT_TYPE_DSS1_TE_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force, mode);
-			if (!port)
-				FATAL("No memory for Port instance\n");
-			earlyb = mISDNport->earlyb;
-			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) created port %s\n", ea_endpoint->ep_serial, port->p_name);
-			memset(&dialinginfo, 0, sizeof(dialinginfo));
-			if (e_dialinginfo.keypad[0])
-				SCPY(dialinginfo.keypad, number);
-			else
-				SCPY(dialinginfo.id, number);
-			dialinginfo.itype = INFO_ITYPE_ISDN;
-			dialinginfo.ntype = e_dialinginfo.ntype;
-			dialinginfo.sending_complete = e_dialinginfo.sending_complete;
-			portlist = ea_endpoint->portlist_new(port->p_serial, port->p_type, mISDNport->earlyb);
-			if (!portlist) {
-				PERROR("EPOINT(%d) cannot allocate port_list relation\n", ea_endpoint->ep_serial);
-				delete port;
-				goto check_anycall_extern;
-			}
-//printf("EXTERNAL caller=%s,id=%s,dial=%s\n", param.setup.networkid, param.setup.callerinfo.id, param.setup.dialinginfo.id);
-			message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_SETUP);
-			memcpy(&message->param.setup.dialinginfo, &dialinginfo, sizeof(struct dialing_info));
-			memcpy(&message->param.setup.redirinfo, &e_redirinfo, sizeof(struct redir_info));
-			memcpy(&message->param.setup.callerinfo, &e_callerinfo, sizeof(struct caller_info));
-			memcpy(&message->param.setup.capainfo, &e_capainfo, sizeof(struct capa_info));
-//terminal			SCPY(message->param.setup.from_terminal, e_ext.number);
-//terminal			if (e_dialinginfo.id)
-//terminal				SCPY(message->param.setup.to_terminal, e_dialinginfo.id);
-				/* handle restricted caller ids */
-			apply_callerid_restriction(&e_ext, message->param.setup.callerinfo.id, &message->param.setup.callerinfo.ntype, &message->param.setup.callerinfo.present, &message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name);
-			apply_callerid_restriction(&e_ext, message->param.setup.callerinfo.id2, &message->param.setup.callerinfo.ntype2, &message->param.setup.callerinfo.present2, &message->param.setup.callerinfo.screen2, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name);
-			apply_callerid_restriction(&e_ext, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL);
-			/* display callerid if desired for extension */
-			SCPY(message->param.setup.callerinfo.display, apply_callerid_display(message->param.setup.callerinfo.id, message->param.setup.callerinfo.itype, message->param.setup.callerinfo.ntype, message->param.setup.callerinfo.present, message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name));
-			message_put(message);
-			logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT);
-			anycall = 1;
-		} while(*p);
+				if (!port)
+					FATAL("No memory for Port instance\n");
+				PDEBUG(DEBUG_EPOINT, "EPOINT(%d) created port %s\n", ea_endpoint->ep_serial, port->p_name);
+				memset(&dialinginfo, 0, sizeof(dialinginfo));
+				if (e_dialinginfo.keypad[0])
+					SCPY(dialinginfo.keypad, number);
+				else
+					SCPY(dialinginfo.id, number);
+				dialinginfo.itype = INFO_ITYPE_ISDN;
+				dialinginfo.ntype = e_dialinginfo.ntype;
+				dialinginfo.sending_complete = e_dialinginfo.sending_complete;
+				portlist = ea_endpoint->portlist_new(port->p_serial, port->p_type, earlyb);
+				if (!portlist) {
+					PERROR("EPOINT(%d) cannot allocate port_list relation\n", ea_endpoint->ep_serial);
+					delete port;
+					continue;
+				}
+	//printf("EXTERNAL caller=%s,id=%s,dial=%s\n", param.setup.networkid, param.setup.callerinfo.id, param.setup.dialinginfo.id);
+				message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_SETUP);
+				memcpy(&message->param.setup.dialinginfo, &dialinginfo, sizeof(struct dialing_info));
+				memcpy(&message->param.setup.redirinfo, &e_redirinfo, sizeof(struct redir_info));
+				memcpy(&message->param.setup.callerinfo, &e_callerinfo, sizeof(struct caller_info));
+				memcpy(&message->param.setup.capainfo, &e_capainfo, sizeof(struct capa_info));
+				memcpy(&message->param.setup.rtpinfo, &e_rtpinfo, sizeof(struct rtp_info));
+	//terminal			SCPY(message->param.setup.from_terminal, e_ext.number);
+	//terminal			if (e_dialinginfo.id)
+	//terminal				SCPY(message->param.setup.to_terminal, e_dialinginfo.id);
+					/* handle restricted caller ids */
+				apply_callerid_restriction(&e_ext, message->param.setup.callerinfo.id, &message->param.setup.callerinfo.ntype, &message->param.setup.callerinfo.present, &message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name);
+				apply_callerid_restriction(&e_ext, message->param.setup.callerinfo.id2, &message->param.setup.callerinfo.ntype2, &message->param.setup.callerinfo.present2, &message->param.setup.callerinfo.screen2, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name);
+				apply_callerid_restriction(&e_ext, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL);
+				/* display callerid if desired for extension */
+				SCPY(message->param.setup.callerinfo.display, apply_callerid_display(message->param.setup.callerinfo.id, message->param.setup.callerinfo.itype, message->param.setup.callerinfo.ntype, message->param.setup.callerinfo.present, message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name));
+				message_put(message);
+				logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT);
+				anycall = 1;
+
+				/* found an interface
+				 * continue only if + is given, so every interface is calles parallel */
+				if (e_dialinginfo.interfaces[0] != '+')
+					break;
+			} while (*ifname_p);
+		} while(*number_p);
 
-		check_anycall_extern:
 		/* now we have all ports created */
 		if (!anycall) {
 			trace_header("INTERFACE (no free ports found)", DIRECTION_NONE);
@@ -1496,7 +1349,6 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un
 	char			buffer[256];
 	int			writeext;		/* flags need to write extension after modification */
 	class Port		*port;
-	struct interface	*interface;
 
 	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
 	
@@ -1505,6 +1357,7 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un
 	memcpy(&e_dialinginfo, &param->setup.dialinginfo, sizeof(e_dialinginfo));
 	memcpy(&e_redirinfo, &param->setup.redirinfo, sizeof(e_redirinfo));
 	memcpy(&e_capainfo, &param->setup.capainfo, sizeof(e_capainfo));
+	memcpy(&e_rtpinfo, &param->setup.rtpinfo, sizeof(e_rtpinfo));
 
 	/* convert (inter-)national number type */
 	SCPY(e_dialinginfo.id, numberrize_callerinfo(e_dialinginfo.id, e_dialinginfo.ntype, options.national, options.international));
@@ -1512,16 +1365,10 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un
 
 //	e_dtmf = param->setup.dtmf;
 	/* screen incoming caller id */
-	interface = interface_first;
-	while(interface) {
-		if (!strcmp(e_callerinfo.interface, interface->name)) {
-			break;
-		}
-		interface = interface->next;
-	}
-	if (interface) {
-		do_screen(0, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, interface);
-		do_screen(0, e_callerinfo.id2, sizeof(e_callerinfo.id2), &e_callerinfo.ntype2, &e_callerinfo.present2, interface);
+	if (e_callerinfo.interface[0]) {
+		do_screen(0, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, e_callerinfo.interface);
+		do_screen(0, e_callerinfo.id2, sizeof(e_callerinfo.id2), &e_callerinfo.ntype2, &e_callerinfo.present2, e_callerinfo.interface);
+		do_screen(0, e_redirinfo.id, sizeof(e_redirinfo.id), &e_redirinfo.ntype, &e_redirinfo.present, e_callerinfo.interface);
 	}
 
 	/* process extension */
@@ -1725,8 +1572,7 @@ void EndpointAppPBX::port_information(struct port_list *portlist, int message_ty
 	}
 	if (e_action)
 	if (e_action->index==ACTION_OUTDIAL
-	 || e_action->index==ACTION_EXTERNAL
-	 || e_action->index==ACTION_REMOTE) {
+	 || e_action->index==ACTION_EXTERNAL) {
 		if (!e_extdialing)
 			set_tone(portlist, "dialing");
 		else if (!e_extdialing[0])
@@ -1852,11 +1698,13 @@ NOTE: vbox is now handled due to overlap state
 /* port MESSAGE_CRYPT */
 void EndpointAppPBX::port_crypt(struct port_list *portlist, int message_type, union parameter *param)
 {
+#ifdef WITH_CRYPT
 	/* send crypt response to cryptman */
 	if (param->crypt.type == CR_MESSAGE_IND)
 		cryptman_msg2man(param->crypt.data, param->crypt.len);
 	else
 		cryptman_message(param->crypt.type, param->crypt.data, param->crypt.len);
+#endif
 }
 
 /* port MESSAGE_OVERLAP */
@@ -1997,7 +1845,6 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 	unsigned int port_id = portlist->port_id;
 	struct port_list *tportlist;
 	class Port *port;
-	struct interface	*interface;
 	time_t now;
 
 	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
@@ -2025,16 +1872,8 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 	time(&now);
 	e_start = now;
 
-	/* screen incoming connected id */
-	interface = interface_first;
-	while(interface) {
-		if (!strcmp(e_connectinfo.interface, interface->name)) {
-			break;
-		}
-		interface = interface->next;
-	}
-	if (interface)
-		do_screen(0, e_connectinfo.id, sizeof(e_connectinfo.id), &e_connectinfo.ntype, &e_connectinfo.present, interface);
+	if (e_callerinfo.interface[0])
+		do_screen(0, e_connectinfo.id, sizeof(e_connectinfo.id), &e_connectinfo.ntype, &e_connectinfo.present, e_connectinfo.interface);
 
 	/* screen connected name */
 	if (e_ext.name[0])
@@ -2284,8 +2123,10 @@ void EndpointAppPBX::port_disconnect_release(struct port_list *portlist, int mes
 			message_put(message);
 			/* disable encryption if disconnected */
 //PERROR("REMOVE ME: state =%d, %d\n", e_crypt_state, e_crypt);
+#ifdef WITH_CRYPT
 			if (e_crypt_state)
 				cryptman_message(CI_DISCONNECT_IND, NULL, 0);
+#endif
 			return;
 		} else {
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) the port has no patterns.\n", ea_endpoint->ep_serial);
@@ -2553,6 +2394,26 @@ void EndpointAppPBX::port_facility(struct port_list *portlist, int message_type,
 	message_put(message);
 }
 
+/* port MESSAGE_3PTY */
+void EndpointAppPBX::port_3pty(struct port_list *portlist, int message_type, union parameter *param)
+{
+	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
+
+	struct lcr_msg *message;
+	int rc;
+
+	rc = join_join();
+	message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_3PTY);
+	message->param.threepty.begin = 1;
+	if (rc < 0)
+		message->param.threepty.error = 1;
+	else
+		message->param.threepty.result = 1;
+	message->param.threepty.invoke_id = param->threepty.invoke_id;
+	logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT);
+	message_put(message);
+}
+
 /* port MESSAGE_SUSPEND */
 /* NOTE: before supending, the inactive-notification must be done in order to set call mixer */
 void EndpointAppPBX::port_suspend(struct port_list *portlist, int message_type, union parameter *param)
@@ -2611,17 +2472,6 @@ void EndpointAppPBX::ea_message_port(unsigned int port_id, int message_type, uni
 
 //	PDEBUG(DEBUG_EPOINT, "received message %d (terminal %s, caller id %s)\n", message, e_ext.number, e_callerinfo.id);
 	switch(message_type) {
-		case MESSAGE_DATA: /* data from port */
-		/* check if there is a call */
-		if (!ea_endpoint->ep_join_id)
-			break;
-		/* continue if only one portlist */
-		if (ea_endpoint->ep_portlist->next != NULL)
-			break;
-		/* forward message */
-		message_forward(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, param);  
-		break;
-
 		case MESSAGE_TONE_EOF: /* tone is end of file */
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) current tone is now end of file.\n", ea_endpoint->ep_serial);
 		if (e_action) {
@@ -2666,6 +2516,11 @@ void EndpointAppPBX::ea_message_port(unsigned int port_id, int message_type, uni
 		port_facility(portlist, message_type, param);
 		break;
 
+		case MESSAGE_3PTY:
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) incoming 3PTY facility (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		port_3pty(portlist, message_type, param);
+		break;
+
 		/* PORT sends DTMF message */
 		case MESSAGE_DTMF: /* dtmf digits received */
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) dtmf digit=%c (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, param->dtmf, e_ext.number, e_callerinfo.id);
@@ -2798,6 +2653,7 @@ void EndpointAppPBX::ea_message_port(unsigned int port_id, int message_type, uni
 /* join MESSAGE_CRYPT */
 void EndpointAppPBX::join_crypt(struct port_list *portlist, int message_type, union parameter *param)
 {
+#ifdef WITH_CRYPT
 	switch(param->crypt.type) {
 		/* message from remote port to "crypt manager" */
 		case CU_ACTK_REQ:           /* activate key-exchange */
@@ -2821,6 +2677,7 @@ void EndpointAppPBX::join_crypt(struct port_list *portlist, int message_type, un
 		default:
 		PERROR("EPOINT(%d) epoint with terminal '%s' (caller id '%s') unknown crypt message: '%d'\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, param->crypt.type);
 	}
+#endif
 }
 
 /* join MESSAGE_INFORMATION */
@@ -3197,6 +3054,7 @@ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, un
 	memcpy(&e_dialinginfo, &param->setup.dialinginfo, sizeof(e_dialinginfo));
 	memcpy(&e_redirinfo, &param->setup.redirinfo, sizeof(e_redirinfo));
 	memcpy(&e_capainfo, &param->setup.capainfo, sizeof(e_capainfo));
+	memcpy(&e_rtpinfo, &param->setup.rtpinfo, sizeof(e_rtpinfo));
 
 	/* process (voice over) data calls */
 	if (e_ext.datacall && e_capainfo.bearer_capa!=INFO_BC_SPEECH && e_capainfo.bearer_capa!=INFO_BC_AUDIO) {
@@ -3225,6 +3083,19 @@ void EndpointAppPBX::join_mISDNsignal(struct port_list *portlist, int message_ty
 	}
 }
 
+/* join MESSAGE_BRIDE */
+void EndpointAppPBX::join_bridge(struct port_list *portlist, int message_type, union parameter *param)
+{
+	struct lcr_msg *message;
+
+	while(portlist) {
+		message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_BRIDGE);
+		memcpy(&message->param, param, sizeof(union parameter));
+		message_put(message);
+		portlist = portlist->next;
+	}
+}
+
 /* join MESSAGE_NOTIFY */
 void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, union parameter *param)
 {
@@ -3306,21 +3177,6 @@ void EndpointAppPBX::ea_message_join(unsigned int join_id, int message_type, uni
 
 	portlist = ea_endpoint->ep_portlist;
 
-	/* send MESSAGE_DATA to port */
-	if (message_type == MESSAGE_DATA) {
-		if (join_id == ea_endpoint->ep_join_id) { // still linked with JOIN
-			/* skip if no port relation */
-			if (!portlist)
-				return;
-			/* skip if more than one port relation */
-			if (portlist->next)
-				return;
-			/* forward audio data to port */
-			message_forward(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, param);
-			return;
-		}
-	}
-
 //	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) received message %d for active JOIN (terminal %s, caller id %s state=%d)\n", ea_endpoint->ep_serial, message, e_ext.number, e_callerinfo.id, e_state);
 	switch(message_type) {
 		/* JOIN SENDS TONE message */
@@ -3410,23 +3266,11 @@ void EndpointAppPBX::ea_message_join(unsigned int join_id, int message_type, uni
 		join_mISDNsignal(portlist, message_type, param);
 		break;
 
-#if 0
-		kann nach dem test gelöscht werden, da eine direkte funktion im join und im mISDN zum austausch der message existiert
-		/* JOIN requests bchannel */
-		case MESSAGE_BCHANNEL: /* indicates the need of own bchannel access */
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received bchannel assignment %d from join.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, param->bchannel.type);
-		/* only one port is expected to be connected to bchannel */
-		if (!portlist)
-			break;
-		if (portlist->next)
-			break;
-		e_join_pattern = 1;
-		SCPY(e_tone, "");
-		set_tone(portlist, NULL);
-		message = message_forward(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, param);
-		logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT);
+		/* JOIN sends bridge message */
+		case MESSAGE_BRIDGE: /* bride message to port */
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received bridge message.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		join_bridge(portlist, message_type, param);
 		break;
-#endif
 
 		/* JOIN has pattern available */
 		case MESSAGE_PATTERN: /* indicating pattern available */
@@ -3509,7 +3353,7 @@ int match_list(char *list, char *item)
 
 	while(42) {
 		/* eliminate white spaces */
-		while (*list <= ' ')
+		while (*list > '\0' && *list <= ' ')
 			list++;
 		if (*list == ',') {
 			list++;
@@ -3716,8 +3560,9 @@ reject:
 
 /* join calls (look for a join that is on hold (same isdn interface/terminal))
  */
-void EndpointAppPBX::join_join(void)
+int EndpointAppPBX::join_join(void)
 {
+#ifdef WITH_MISDN
 	struct lcr_msg *message;
 	struct join_relation *our_relation, *other_relation;
 	struct join_relation **our_relation_pointer, **other_relation_pointer;
@@ -3731,29 +3576,29 @@ void EndpointAppPBX::join_join(void)
 	our_join = find_join_id(ea_endpoint->ep_join_id);
 	if (!our_join) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: our join doesn't exist anymore.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	if (our_join->j_type != JOIN_TYPE_PBX) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: join is not a pbx join.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	our_joinpbx = (class JoinPBX *)our_join;
 	if (!ea_endpoint->ep_portlist) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: we have no port.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	if (!e_ext.number[0]) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: we are not internal extension.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	our_port = find_port_id(ea_endpoint->ep_portlist->port_id);
 	if (!our_port) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: our port doesn't exist anymore.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	if ((our_port->p_type & PORT_CLASS_mISDN_MASK) != PORT_CLASS_DSS1) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: our port is not isdn.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	our_pdss1 = (class Pdss1 *)our_port;
 
@@ -3774,7 +3619,7 @@ void EndpointAppPBX::join_join(void)
 				 || other_port->p_type==PORT_TYPE_DSS1_NT_IN) { /* port is isdn nt-mode */
 					other_pdss1 = (class Pdss1 *)other_port;
 					PDEBUG(DEBUG_EPOINT, "EPOINT(%d) comparing other endpoint's port is of type isdn! comparing our portnum=%d with other's portnum=%d hold=%s ces=%d\n", ea_endpoint->ep_serial, our_pdss1->p_m_mISDNport->portnum, other_pdss1->p_m_mISDNport->portnum, (other_pdss1->p_m_hold)?"YES":"NO", other_pdss1->p_m_d_ces);
-					if (other_pdss1->p_m_hold /* port is on hold */
+					if (1 //other_pdss1->p_m_hold /* port is on hold */
 					 && other_pdss1->p_m_mISDNport == our_pdss1->p_m_mISDNport /* same isdn interface */
 					 && other_pdss1->p_m_d_ces == our_pdss1->p_m_d_ces) /* same tei+sapi */
 						break;
@@ -3789,28 +3634,28 @@ void EndpointAppPBX::join_join(void)
 	}
 	if (!other_eapp) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: no other endpoint on same isdn terminal.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) port with same terminal found.\n", ea_endpoint->ep_serial);
 
 	/* if we have the same join */
 	if (other_eapp->ea_endpoint->ep_join_id == ea_endpoint->ep_join_id) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: we and the other have the same join.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	other_join = find_join_id(other_eapp->ea_endpoint->ep_join_id);
 	if (!other_join) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: other join doesn't exist anymore.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	if (other_join->j_type != JOIN_TYPE_PBX) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: other join is not a pbx join.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 	other_joinpbx = (class JoinPBX *)other_join;
 	if (our_joinpbx->j_partyline && other_joinpbx->j_partyline) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: both joins are partylines.\n", ea_endpoint->ep_serial);
-		return;
+		return -1;
 	}
 
 	/* remove relation to endpoint for join on hold */
@@ -3868,6 +3713,11 @@ void EndpointAppPBX::join_join(void)
 
 	/* we send a retrieve to that endpoint */
 	// mixer will update the hold-state of the join and send it to the endpoints is changes
+#else
+	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: no mISDN support anyway.\n", ea_endpoint->ep_serial);
+#endif
+
+	return 0;
 }
 
 
@@ -4361,6 +4211,21 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 		break;
 #endif
 
+		case MESSAGE_3PTY:
+		if (param->threepty.begin)
+			trace_header("Begin3PTY", dir);
+		if (param->threepty.end)
+			trace_header("End3PTY", dir);
+		if (param->threepty.invoke)
+			add_trace("action", NULL, "invoke");
+		if (param->threepty.result)
+			add_trace("action", NULL, "result");
+		if (param->threepty.error)
+			add_trace("action", NULL, "error");
+		add_trace("invoke-id", NULL, "%d", param->threepty.invoke_id);
+		end_trace();
+		break;
+
 		default:
 		PERROR("EPOINT(%d) message not of correct type (%d)\n", ea_endpoint->ep_serial, message_type);
 	}