X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=c19865bdf30fdf9185c1fc191df906afa4e3911b;hp=1262ef68e3eec9505faa5801b31b6be9bb0e4272;hb=b2a665f8f1cdeb7d02c3f665d95e6a80297e21d1;hpb=db6990e487255e8b206ef67d8d99fa74849a9a11

diff --git a/apppbx.cpp b/apppbx.cpp
index 1262ef6..c19865b 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -10,14 +10,6 @@
 \*****************************************************************************/ 
 
 
-#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <poll.h>
 #include "main.h"
 
 class EndpointAppPBX *apppbx_first = NULL;
@@ -25,7 +17,7 @@ class EndpointAppPBX *apppbx_first = NULL;
 /*
  * EndpointAppPBX constructor
  */
-EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint) : EndpointApp(epoint)
+EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint, int origin) : EndpointApp(epoint, origin)
 {
 	class EndpointAppPBX **apppointer;
 
@@ -38,8 +30,9 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint) : EndpointApp(epoint)
 
 	/* initialize */
         memset(&e_ext, 0, sizeof(struct extension));
+	// *************** NOTE: also change value in read_extension() **************
 	e_ext.rights = 4; /* international */
-	e_ext.rxvol = e_ext.txvol = 256;
+	e_ext.rx_gain = e_ext.tx_gain = 0;
         e_state = EPOINT_STATE_IDLE;
         e_ext.number[0] = '\0';
 	e_extension_interface[0] = '\0';
@@ -49,7 +42,7 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint) : EndpointApp(epoint)
         memset(&e_redirinfo, 0, sizeof(struct redir_info));
         memset(&e_capainfo, 0, sizeof(struct capa_info));
         e_start = e_stop = 0;
-//      e_origin = 0;
+	e_origin = origin;
 	e_ruleset = ruleset_main;
 	if (e_ruleset)
         	e_rule = e_ruleset->rule_first;
@@ -80,6 +73,7 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint) : EndpointApp(epoint)
         e_dtmf = 0;
         e_dtmf_time = 0;
         e_dtmf_last = 0;
+	e_enablekeypad = 0;
 	e_cfnr_release = 0;
 	e_cfnr_call = 0;
 	e_password_timeout = 0;
@@ -134,7 +128,7 @@ EndpointAppPBX::~EndpointAppPBX(void)
 /*
  * trace header for application
  */
-void EndpointAppPBX::trace_header(char *name, int direction)
+void EndpointAppPBX::trace_header(const char *name, int direction)
 {
 	struct trace _trace;
 
@@ -145,7 +139,7 @@ void EndpointAppPBX::trace_header(char *name, int direction)
 	/* init trace with given values */
 	start_trace(0,
 		    NULL,
-		    numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype),
+		    numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype, options.national, options.international),
 		    e_dialinginfo.id,
 		    direction,
 		    CATEGORY_EP,
@@ -173,164 +167,12 @@ void EndpointAppPBX::new_state(int state)
 }
 
 
-/* screen caller id
- * out==0: incomming caller id, out==1: outgoing caller id
- */
-void EndpointAppPBX::screen(int out, char *id, int idsize, int *type, int *present, struct interface *interface)
-{
-	char			*msn1;
-	struct interface_msn	*ifmsn;
-	struct interface_screen	*ifscreen;
-	char suffix[64];
-
-	/* screen incoming caller id */
-	if (!out)
-	{
-		/* check for MSN numbers, use first MSN if no match */
-		msn1 = NULL;
-		ifmsn = interface->ifmsn;
-		while(ifmsn)
-		{
-			if (!msn1)
-				msn1 = ifmsn->msn;
-			if (!strcmp(ifmsn->msn, id))
-			{
-				break;
-			}
-			ifmsn = ifmsn->next;
-		}
-		if (ifmsn)
-		{
-			trace_header("SCREEN (found in MSN list)", DIRECTION_IN);
-			add_trace("msn", NULL, "%s", id);
-			end_trace();
-		}
-		if (!ifmsn && msn1) // not in list, first msn given
-		{
-			trace_header("SCREEN (not found MSN in list)", DIRECTION_IN);
-			add_trace("msn", "given", "%s", id);
-			add_trace("msn", "used", "%s", msn1);
-			end_trace();
-			UNCPY(id, msn1, idsize);
-			id[idsize-1] = '\0';
-		}
-	}
-
-	/* check screen list */
-	if (out)
-		ifscreen = interface->ifscreen_out;
-	else
-		ifscreen = interface->ifscreen_in;
-	while (ifscreen)
-	{
-		if (ifscreen->match_type==-1 || ifscreen->match_type==*type)
-		if (ifscreen->match_present==-1 || ifscreen->match_present==*present)
-		{
-			if (strchr(ifscreen->match,'%'))
-			{
-				if (!strncmp(ifscreen->match, id, strchr(ifscreen->match,'%')-ifscreen->match))
-					break;
-			} else
-			{
-				if (!strcmp(ifscreen->match, id))
-					break;
-			}
-		}
-		ifscreen = ifscreen->next;
-	}
-	if (ifscreen) // match
-	{
-		trace_header("SCREEN (found in screen list)", out?DIRECTION_OUT:DIRECTION_IN);
-		switch(*type)
-		{
-			case INFO_NTYPE_UNKNOWN:
-			add_trace("given", "type", "unknown");
-			break;
-			case INFO_NTYPE_SUBSCRIBER:
-			add_trace("given", "type", "subscriber");
-			break;
-			case INFO_NTYPE_NATIONAL:
-			add_trace("given", "type", "national");
-			break;
-			case INFO_NTYPE_INTERNATIONAL:
-			add_trace("given", "type", "international");
-			break;
-		}
-		switch(*present)
-		{
-			case INFO_PRESENT_ALLOWED:
-			add_trace("given", "present", "allowed");
-			break;
-			case INFO_PRESENT_RESTRICTED:
-			add_trace("given", "present", "restricted");
-			break;
-			case INFO_PRESENT_NOTAVAIL:
-			add_trace("given", "present", "not available");
-			break;
-		}
-		add_trace("given", "id", "%s", id[0]?id:"<empty>");
-		if (ifscreen->result_type != -1)
-		{
-			*type = ifscreen->result_type;
-			switch(*type)
-			{
-				case INFO_NTYPE_UNKNOWN:
-				add_trace("used", "type", "unknown");
-				break;
-				case INFO_NTYPE_SUBSCRIBER:
-				add_trace("used", "type", "subscriber");
-				break;
-				case INFO_NTYPE_NATIONAL:
-				add_trace("used", "type", "national");
-				break;
-				case INFO_NTYPE_INTERNATIONAL:
-				add_trace("used", "type", "international");
-				break;
-			}
-		}
-		if (ifscreen->result_present != -1)
-		{
-			*present = ifscreen->result_present;
-			switch(*present)
-			{
-				case INFO_PRESENT_ALLOWED:
-				add_trace("used", "present", "allowed");
-				break;
-				case INFO_PRESENT_RESTRICTED:
-				add_trace("used", "present", "restricted");
-				break;
-				case INFO_PRESENT_NOTAVAIL:
-				add_trace("used", "present", "not available");
-				break;
-			}
-		}
-		if (strchr(ifscreen->match,'%'))
-		{
-			SCPY(suffix, strchr(ifscreen->match,'%') - ifscreen->match + id);
-			UNCPY(id, ifscreen->result, idsize);
-			id[idsize-1] = '\0';
-			if (strchr(ifscreen->result,'%'))
-			{
-				*strchr(ifscreen->result,'%') = '\0';
-				UNCAT(id, suffix, idsize);
-				id[idsize-1] = '\0';
-			}
-		} else
-		{
-			UNCPY(id, ifscreen->result, idsize);
-			id[idsize-1] = '\0';
-		}
-		add_trace("used", "id", "%s", id[0]?id:"<empty>");
-		end_trace();
-	}
-}
-
 /* release join and port (as specified)
  */
 void EndpointAppPBX::release(int release, int joinlocation, int joincause, int portlocation, int portcause)
 {
 	struct port_list *portlist;
-	struct message *message;
+	struct lcr_msg *message;
 	char cause[16];
 
 	/* message to test call */
@@ -397,6 +239,7 @@ void EndpointAppPBX::release(int release, int joinlocation, int joincause, int p
 			e_dtmf = 0;
 			e_dtmf_time = 0;
 			e_dtmf_last = 0;
+			e_enablekeypad = 0;
 			e_cfnr_release = 0;
 			e_cfnr_call = 0;
 			e_multipoint_cause = 0;
@@ -433,7 +276,7 @@ void EndpointAppPBX::release(int release, int joinlocation, int joincause, int p
 				} else
 				{
 					/* numberrize caller id and use it to dial to the callback */
-					SCPY(e_dialinginfo.id, numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype));
+					SCPY(e_dialinginfo.id, numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype, options.national, options.international));
 				}
 				e_dialinginfo.itype = INFO_ITYPE_ISDN;
 				e_dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
@@ -450,7 +293,7 @@ void EndpointAppPBX::release(int release, int joinlocation, int joincause, int p
 
 
 /* cancel callerid if restricted, unless anon-ignore is enabled at extension or port is of type external (so called police gets caller id :)*/
-void apply_callerid_restriction(int anon_ignore, char *id, int *ntype, int *present, int *screen, char *extension, char *name)
+void apply_callerid_restriction(struct extension *ext, char *id, int *ntype, int *present, int *screen, char *extension, char *name)
 {
 	PDEBUG(DEBUG_EPOINT, "id='%s' ntype=%d present=%d screen=%d extension='%s' name='%s'\n", (id)?id:"NULL", (ntype)?*ntype:-1, (present)?*present:-1, (screen)?*screen:-1, (extension)?extension:"NULL", (name)?name:"NULL");
 
@@ -459,13 +302,11 @@ void apply_callerid_restriction(int anon_ignore, char *id, int *ntype, int *pres
 		return;
 
 	/* only extensions are restricted */
-	if (!extension)
-		return;
-	if (!extension[0])
+	if (!ext->number[0])
 		return;
 
 	/* if we enabled anonymouse ignore */
-	if (anon_ignore)
+	if (ext->anon_ignore)
 		return;
 
 	/* else we remove the caller id */
@@ -486,12 +327,12 @@ void apply_callerid_restriction(int anon_ignore, char *id, int *ntype, int *pres
 }
 
 /* used display message to display callerid as available */
-char *EndpointAppPBX::apply_callerid_display(char *id, int itype, int ntype, int present, int screen, char *extension, char *name)
+char *EndpointAppPBX::apply_callerid_display(const char *id, int itype, int ntype, int present, int screen, const char *extension, const char *name)
 {
 	static char display[81];
 
 	display[0] = '\0';
-	char *cid = numberrize_callerinfo(id, ntype);
+	const char *cid = numberrize_callerinfo(id, ntype, options.national, options.international);
 
 	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) id='%s' itype=%d ntype=%d present=%d screen=%d extension='%s' name='%s'\n", ea_endpoint->ep_serial, (id)?id:"NULL", itype, ntype, present, screen, (extension)?extension:"NULL", (name)?name:"NULL");
 
@@ -581,7 +422,7 @@ char *EndpointAppPBX::apply_callerid_display(char *id, int itype, int ntype, int
 void EndpointAppPBX::notify_active(void)
 {
 	struct port_list *portlist = ea_endpoint->ep_portlist;
-	struct message *message;
+	struct lcr_msg *message;
 	int notify = 0;
 
 	switch(e_tx_state)
@@ -687,9 +528,9 @@ void EndpointAppPBX::keypad_function(char digit)
 
 
 /* set tone pattern for port */
-void EndpointAppPBX::set_tone(struct port_list *portlist, char *tone)
+void EndpointAppPBX::set_tone(struct port_list *portlist, const char *tone)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	if (!tone)
 		tone = "";
@@ -782,7 +623,7 @@ foundif:
 	if (!interface->ifport)
 	{
 		/* no ports */
-		trace_header("CHANNEL SELECTION (interface has no active ports, skipping)", DIRECTION_NONE);
+		trace_header("CHANNEL SELECTION (active ports, skipping)", DIRECTION_NONE);
 		add_trace("interface", NULL, "%s", interface->name);
 		end_trace();
 		interface = interface->next;
@@ -831,9 +672,9 @@ foundif:
 	}
 
 	/* see if link is up on PTP*/
-	if (mISDNport->ptp && !mISDNport->l2link)
+	if (mISDNport->l2hold && !mISDNport->l2link)
 	{
-		trace_header("CHANNEL SELECTION (port is ptp with layer 2 down, skipping)", DIRECTION_NONE);
+		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();
@@ -866,14 +707,26 @@ foundif:
 				}
 				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);
+			trace_header("CHANNEL SELECTION (using 'any' channel)", DIRECTION_NONE);
 			add_trace("port", NULL, "%d", ifport->portnum);
 			add_trace("position", NULL, "%d", index);
 			end_trace();
@@ -881,7 +734,7 @@ foundif:
 			break;
 
 			case CHANNEL_NO: /* call waiting */
-			trace_header("CHANNEL SELECTION (using 'no channel', call-waiting)", DIRECTION_NONE);
+			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();
@@ -890,10 +743,25 @@ foundif:
 
 			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;
@@ -943,6 +811,11 @@ foundif:
 	if (ifport != ifport_start)
 		goto nextport;
 
+	if (!ifname) {
+		interface = interface->next;
+		goto checknext;
+	}
+
 	return(NULL); /* no port found */
 }
 
@@ -956,10 +829,10 @@ void EndpointAppPBX::out_setup(void)
 	class Port		*port;
 //	class pdss1		*pdss1;
 	struct port_list	*portlist;
-	struct message		*message;
+	struct lcr_msg		*message;
 	int			anycall = 0;
 	int			cause = CAUSE_RESSOURCEUNAVAIL;
-	char			*p;
+	const char		*p;
 	char			cfp[64];
 	struct mISDNport	*mISDNport;
 	char			portname[32];
@@ -972,6 +845,10 @@ void EndpointAppPBX::out_setup(void)
 	struct port_settings	port_settings;
 	int			channel = 0;
 	int			earlyb;
+	int			mode = B_MODE_TRANSPARENT;
+
+	/* set bchannel mode */
+	mode = e_capainfo.source_mode;
 
 	/* create settings for creating port */
 	memset(&port_settings, 0, sizeof(port_settings));
@@ -979,13 +856,6 @@ void EndpointAppPBX::out_setup(void)
 		SCPY(port_settings.tones_dir, e_ext.tones_dir);
 	else
 		SCPY(port_settings.tones_dir, options.tones_dir);
-	port_settings.tout_setup = e_ext.tout_setup;
-	port_settings.tout_dialing = e_ext.tout_dialing;
-	port_settings.tout_proceeding = e_ext.tout_proceeding;
-	port_settings.tout_alerting = e_ext.tout_alerting;
-	port_settings.tout_disconnect = e_ext.tout_disconnect;
-//	port_settings.tout_hold = e_ext.tout_hold;
-//	port_settings.tout_park = e_ext.tout_park;
 	port_settings.no_seconds = e_ext.no_seconds;
 	
 	/* NOTE: currently the try_card feature is not supported. it should be used later to try another card, if the outgoing call fails on one port */
@@ -1117,7 +987,7 @@ void EndpointAppPBX::out_setup(void)
 			}
 			/* creating INTERNAL port */
 			SPRINT(portname, "%s-%d-out", mISDNport->ifport->interface->name, mISDNport->portnum);
-			port = new Pdss1((mISDNport->ntmode)?PORT_TYPE_DSS1_NT_OUT:PORT_TYPE_DSS1_TE_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force);
+			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 DSS1 Port instance\n");
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) got port %s\n", ea_endpoint->ep_serial, port->p_name);
@@ -1134,7 +1004,7 @@ void EndpointAppPBX::out_setup(void)
 				goto check_anycall_intern;
 			}
 			/* directory.list */
-			if (e_callerinfo.id[0] && (e_ext.centrex || e_ext.display_name))
+			if (e_callerinfo.id[0] && e_ext.display_name)
 			{
 				dirname = parse_directory(e_callerinfo.id, e_callerinfo.ntype);
 				if (dirname)
@@ -1152,19 +1022,19 @@ void EndpointAppPBX::out_setup(void)
 //terminal			if (e_dialinginfo.id)
 //terminal				SCPY(message->param.setup.to_terminal, e_dialinginfo.id);
 			/* handle restricted caller ids */
-			apply_callerid_restriction(e_ext.anon_ignore, 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.anon_ignore, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL);
+			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.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));
 //printf("\n\ndisplay = %s\n\n\n",message->param.setup.callerinfo.display);
 			/* use cnip, if enabld */
-			if (!e_ext.centrex)
-				message->param.setup.callerinfo.name[0] = '\0';
+	//		if (!e_ext.centrex)
+	//			message->param.setup.callerinfo.name[0] = '\0';
 			/* screen clip if prefix is required */
 			if (message->param.setup.callerinfo.id[0] && e_ext.clip_prefix[0])
 			{
 				SCPY(message->param.setup.callerinfo.id, e_ext.clip_prefix);
-				SCAT(message->param.setup.callerinfo.id, numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype));
+				SCAT(message->param.setup.callerinfo.id, numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype, options.national, options.international));
 				message->param.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
 			}
 			/* use internal caller id */
@@ -1225,7 +1095,7 @@ void EndpointAppPBX::out_setup(void)
 				{
 					/* creating EXTERNAL port*/
 					SPRINT(portname, "%s-%d-out", mISDNport->ifport->interface->name, mISDNport->portnum);
-					if (!(port = new Pdss1((mISDNport->ntmode)?PORT_TYPE_DSS1_NT_OUT:PORT_TYPE_DSS1_TE_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force)))
+					if (!(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)))
 						FATAL("No memory for DSS1 Port instance\n");
 					earlyb = mISDNport->earlyb;
 				} else
@@ -1271,8 +1141,8 @@ void EndpointAppPBX::out_setup(void)
 //terminal			if (e_dialinginfo.id)
 //terminal				SCPY(message->param.setup.to_terminal, e_dialinginfo.id);
 				/* handle restricted caller ids */
-			apply_callerid_restriction(e_ext.anon_ignore, 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.anon_ignore, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL);
+			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.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);
@@ -1319,7 +1189,7 @@ void EndpointAppPBX::out_setup(void)
 			}
 			/* creating EXTERNAL port*/
 			SPRINT(portname, "%s-%d-out", mISDNport->ifport->interface->name, mISDNport->portnum);
-			if (!(port = new Pdss1((mISDNport->ntmode)?PORT_TYPE_DSS1_NT_OUT:PORT_TYPE_DSS1_TE_OUT, mISDNport, portname, &port_settings, channel, mISDNport->ifport->channel_force)))
+			if (!(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)))
 				FATAL("No memory for DSS1 Port instance\n");
 			earlyb = mISDNport->earlyb;
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) created port %s\n", ea_endpoint->ep_serial, port->p_name);
@@ -1346,8 +1216,8 @@ void EndpointAppPBX::out_setup(void)
 //terminal			if (e_dialinginfo.id)
 //terminal				SCPY(message->param.setup.to_terminal, e_dialinginfo.id);
 				/* handle restricted caller ids */
-			apply_callerid_restriction(e_ext.anon_ignore, 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.anon_ignore, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL);
+			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.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);
@@ -1458,7 +1328,7 @@ int EndpointAppPBX::handler(void)
 	if (e_cfnr_release)
 	{
 		struct port_list *portlist;
-		struct message *message;
+		struct lcr_msg *message;
 
 		if (now >= e_cfnr_release)
 		{
@@ -1477,7 +1347,7 @@ int EndpointAppPBX::handler(void)
 			}
 			/* put on hold */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 			message_put(message);
 			/* indicate no patterns */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_NOPATTERN);
@@ -1599,7 +1469,7 @@ void EndpointAppPBX::hookflash(void)
 /* port MESSAGE_SETUP */
 void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message		*message;
+	struct lcr_msg		*message;
 	char			buffer[256];
 	int			writeext;		/* flags need to write extension after modification */
 	class Port		*port;
@@ -1612,7 +1482,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));
-	e_dtmf = param->setup.dtmf;
+//	e_dtmf = param->setup.dtmf;
 	/* screen incoming caller id */
 	interface = interface_first;
 	while(interface)
@@ -1624,7 +1494,7 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un
 		interface = interface->next;
 	}
 	if (interface)
-		screen(0, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, interface);
+		do_screen(0, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, interface);
 
 	/* process extension */
 	if (e_callerinfo.itype == INFO_ITYPE_ISDN_EXTENSION)
@@ -1702,12 +1572,12 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un
 
 		/* set volume of rx and tx */
 		if (param->setup.callerinfo.itype == INFO_ITYPE_ISDN_EXTENSION)
-		if (e_ext.txvol!=256 || e_ext.rxvol!=256)
+		if (e_ext.tx_gain!=0 || e_ext.rx_gain!=0)
 		{
 			message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_mISDNSIGNAL);
 			message->param.mISDNsignal.message = mISDNSIGNAL_VOLUME;
-			message->param.mISDNsignal.rxvol = e_ext.txvol;
-			message->param.mISDNsignal.txvol = e_ext.rxvol;
+			message->param.mISDNsignal.rx_gain = e_ext.tx_gain;
+			message->param.mISDNsignal.tx_gain = e_ext.rx_gain;
 			message_put(message);
 		}
 
@@ -1767,6 +1637,10 @@ void EndpointAppPBX::port_information(struct port_list *portlist, int message_ty
 {
 	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
 
+	/* ignore information message without digit information */
+	if (!param->information.id[0])
+		return;
+
 	e_overlap = 1;
 
 	/* turn off dtmf detection, in case dtmf is sent with keypad information */
@@ -1802,7 +1676,7 @@ void EndpointAppPBX::port_information(struct port_list *portlist, int message_ty
 	/* keypad when connected */
 	if (e_state == EPOINT_STATE_CONNECT)
 	{
-		if (e_ext.keypad)
+		if (e_ext.keypad || e_enablekeypad)
 		{
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) keypad information received during connect: %s.\n", ea_endpoint->ep_serial, param->information.id);
 			/* processing keypad function */
@@ -1814,14 +1688,20 @@ void EndpointAppPBX::port_information(struct port_list *portlist, int message_ty
 				keypad_function(param->information.id[0]);
 		} else
 		{
-			trace_header("DTMF (not enabled by extension's settings)", DIRECTION_IN);
+			if (e_ext.number[0])
+				trace_header("KEYPAD (not enabled by extension's settings)", DIRECTION_IN);
+			else
+				trace_header("KEYPAD (not enabled for external interfaces)", DIRECTION_IN);
 			end_trace();
 		}
 		return;
 	}
 	if (e_state != EPOINT_STATE_IN_OVERLAP)
 	{
-		trace_header("DTMF (ignored, not connected and not dialing)", DIRECTION_IN);
+		if (e_ext.number[0])
+			trace_header("KEYPAD (ignored, not connected and not dialing)", DIRECTION_IN);
+		else
+			trace_header("KEYPAD (not enabled for external interfaces)", DIRECTION_IN);
 		end_trace();
 		return;
 	}
@@ -1833,7 +1713,8 @@ 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_EXTERNAL
+	 || e_action->index==ACTION_REMOTE)
 	{
 		if (!e_extdialing)
 			set_tone(portlist, "dialing");
@@ -1976,7 +1857,7 @@ void EndpointAppPBX::port_crypt(struct port_list *portlist, int message_type, un
 /* port MESSAGE_OVERLAP */
 void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
 
@@ -2003,7 +1884,7 @@ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type,
 
 		/* connect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	} else
 	{
@@ -2013,7 +1894,7 @@ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type,
 
 		/* disconnect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_HOLD;
+		message->param.audiopath = 0;
 		message_put(message);
 	}
 	new_state(EPOINT_STATE_OUT_OVERLAP);
@@ -2029,7 +1910,7 @@ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type,
 /* port MESSAGE_PROCEEDING */
 void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
 
@@ -2046,7 +1927,7 @@ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_typ
 
 		/* connect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	} else
 	{
@@ -2056,7 +1937,7 @@ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_typ
 
 		/* disconnect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_HOLD;
+		message->param.audiopath = 0;
 		message_put(message);
 	}
 	/* if we are in a call */
@@ -2071,12 +1952,15 @@ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_typ
 /* port MESSAGE_ALERTING */
 void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
 
 	/* signal to call tool */
 	admin_call_response(e_adminid, ADMIN_CALL_ALERTING, "", 0, 0, 0);
+//#warning hack!!
+//	if (e_adminid)
+//		set_tone(portlist, "hold");
 
 	new_state(EPOINT_STATE_OUT_ALERTING);
 	/* check if pattern is available */
@@ -2088,7 +1972,7 @@ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type,
 
 		/* connect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	} else
 	{
@@ -2098,7 +1982,7 @@ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type,
 
 		/* disconnect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_HOLD;
+		message->param.audiopath = 0;
 		message_put(message);
 	}
 	/* if we are in a call */
@@ -2113,9 +1997,9 @@ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type,
 /* port MESSAGE_CONNECT */
 void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 	char buffer[256];
-	unsigned long port_id = portlist->port_id;
+	unsigned int port_id = portlist->port_id;
 	struct port_list *tportlist;
 	class Port *port;
 	struct interface	*interface;
@@ -2123,7 +2007,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
 
 	/* signal to call tool */
-	admin_call_response(e_adminid, ADMIN_CALL_CONNECT, numberrize_callerinfo(param->connectinfo.id,param->connectinfo.ntype), 0, 0, 0);
+	admin_call_response(e_adminid, ADMIN_CALL_CONNECT, numberrize_callerinfo(param->connectinfo.id,param->connectinfo.ntype, options.national, options.international), 0, 0, 0);
 
 	memcpy(&e_connectinfo, &param->connectinfo, sizeof(e_connectinfo));
 	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) removing all other ports (start)\n", ea_endpoint->ep_serial);
@@ -2156,7 +2040,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 		interface = interface->next;
 	}
 	if (interface)
-		screen(0, e_connectinfo.id, sizeof(e_connectinfo.id), &e_connectinfo.ntype, &e_connectinfo.present, interface);
+		do_screen(0, e_connectinfo.id, sizeof(e_connectinfo.id), &e_connectinfo.ntype, &e_connectinfo.present, interface);
 
 	/* screen connected name */
 	if (e_ext.name[0])
@@ -2186,12 +2070,12 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 	new_state(EPOINT_STATE_CONNECT);
 
 	/* set volume of rx and tx */
-	if (e_ext.txvol!=256 || e_ext.rxvol!=256)
+	if (e_ext.tx_gain!=0 || e_ext.rx_gain!=0)
 	{
 		message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_mISDNSIGNAL);
 		message->param.mISDNsignal.message = mISDNSIGNAL_VOLUME;
-		message->param.mISDNsignal.rxvol = e_ext.txvol;
-		message->param.mISDNsignal.txvol = e_ext.rxvol;
+		message->param.mISDNsignal.rx_gain = e_ext.tx_gain;
+		message->param.mISDNsignal.tx_gain = e_ext.rx_gain;
 		message_put(message);
 	}
 
@@ -2209,7 +2093,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 			port = find_port_id(portlist->port_id);
 			if (port)
 			{
-				SCPY(e_connectinfo.id, nationalize_callerinfo(port->p_dialinginfo.id, &e_connectinfo.ntype));
+				SCPY(e_connectinfo.id, nationalize_callerinfo(port->p_dialinginfo.id, &e_connectinfo.ntype, options.national, options.international));
 				e_connectinfo.present = INFO_PRESENT_ALLOWED;
 			}
 		}
@@ -2223,7 +2107,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 		message_put(message);
 
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	} else if (!e_adminid)
 	{
@@ -2323,9 +2207,9 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 /* port MESSAGE_DISCONNECT MESSAGE_RELEASE */
 void EndpointAppPBX::port_disconnect_release(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message	*message;
+	struct lcr_msg	*message;
 	char		buffer[256];
-	unsigned long	port_id = portlist->port_id;
+	unsigned int	port_id = portlist->port_id;
 	int		cause,
 			location;
 
@@ -2423,7 +2307,7 @@ void EndpointAppPBX::port_disconnect_release(struct port_list *portlist, int mes
 			message_put(message);
 			/* connect audio, if not already */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 			message_put(message);
 			/* send disconnect */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, message_type);
@@ -2537,12 +2421,12 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u
 {
 	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
 
-	struct message *message;
-	char *logtext = "";
+	struct lcr_msg *message;
+	const char *logtext = "";
 	char buffer[64];
 
 	/* signal to call tool */
-	admin_call_response(e_adminid, ADMIN_CALL_NOTIFY, numberrize_callerinfo(param->notifyinfo.id,param->notifyinfo.ntype), 0, 0, param->notifyinfo.notify);
+	admin_call_response(e_adminid, ADMIN_CALL_NOTIFY, numberrize_callerinfo(param->notifyinfo.id,param->notifyinfo.ntype, options.national, options.international), 0, 0, param->notifyinfo.notify);
 	if (param->notifyinfo.notify)
 	{
 		e_rx_state = track_notify(e_rx_state, param->notifyinfo.notify);
@@ -2557,7 +2441,7 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u
 		if (ea_endpoint->ep_join_id)
 		{
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 			message_put(message);
 		}
 		break;
@@ -2566,13 +2450,13 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u
 		case INFO_NOTIFY_USER_RESUMED:
 		/* set volume of rx and tx */
 		if (param->setup.callerinfo.itype == INFO_ITYPE_ISDN_EXTENSION)
-		if (e_ext.txvol!=256 || e_ext.rxvol!=256)
+		if (e_ext.tx_gain!=0 || e_ext.rx_gain!=0)
 		if (portlist)
 		{
 			message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_mISDNSIGNAL);
 			message->param.mISDNsignal.message = mISDNSIGNAL_VOLUME;
-			message->param.mISDNsignal.rxvol = e_ext.txvol;
-			message->param.mISDNsignal.txvol = e_ext.rxvol;
+			message->param.mISDNsignal.rx_gain = e_ext.tx_gain;
+			message->param.mISDNsignal.tx_gain = e_ext.rx_gain;
 			message_put(message);
 		}
 		/* set current tone */
@@ -2582,7 +2466,7 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u
 		if (ea_endpoint->ep_join_id)
 		{
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 			message_put(message);
 		}
 		break;
@@ -2684,7 +2568,7 @@ void EndpointAppPBX::port_facility(struct port_list *portlist, int message_type,
 {
 	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
 
-	struct message *message;
+	struct lcr_msg *message;
 
 	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_FACILITY);
 	memcpy(&message->param.facilityinfo, &param->facilityinfo, sizeof(struct facility_info));
@@ -2720,10 +2604,10 @@ void EndpointAppPBX::port_resume(struct port_list *portlist, int message_type, u
 
 /* port sends message to the endpoint
  */
-void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, union parameter *param)
+void EndpointAppPBX::ea_message_port(unsigned int port_id, int message_type, union parameter *param)
 {
 	struct port_list *portlist;
-	struct message *message;
+	struct lcr_msg *message;
 
 	portlist = ea_endpoint->ep_portlist;
 	while(portlist)
@@ -2901,6 +2785,7 @@ void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, un
 		break;
 
 #if 0
+		kann nach dem test gelöscht werden, da eine direkte funktion im join und im mISDN zum austausch der message existiert
 		/* port assigns bchannel */
 		case MESSAGE_BCHANNEL: /* bchannel assignment messafe */
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received bchannel message %d from port.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, param->bchannel.type);
@@ -2953,7 +2838,7 @@ void EndpointAppPBX::join_crypt(struct port_list *portlist, int message_type, un
 /* join MESSAGE_INFORMATION */
 void EndpointAppPBX::join_information(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	e_overlap = 1;
 
@@ -2970,9 +2855,9 @@ void EndpointAppPBX::join_information(struct port_list *portlist, int message_ty
 /* join MESSAGE_FACILITY */
 void EndpointAppPBX::join_facility(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
-	if (!e_ext.facility)
+	if (!e_ext.facility && e_ext.number[0])
 	{
 		return;
 	}
@@ -2990,7 +2875,7 @@ void EndpointAppPBX::join_facility(struct port_list *portlist, int message_type,
 /* join MESSAGE_MORE */
 void EndpointAppPBX::join_overlap(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	new_state(EPOINT_STATE_IN_OVERLAP);
 	
@@ -2999,24 +2884,33 @@ void EndpointAppPBX::join_overlap(struct port_list *portlist, int message_type,
 	{
 		/* disconnect audio */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_HOLD;
+		message->param.audiopath = 0;
 		message_put(message);
 	}
 	if (e_action) if (e_action->index == ACTION_OUTDIAL || e_action->index == ACTION_EXTERNAL)
 	{
-			set_tone(portlist, "dialtone");
+			if (e_dialinginfo.id[0])
+				set_tone(portlist, "dialing");
+			else
+				set_tone(portlist, "dialtone");
 			return;
 	}
-	if (e_ext.number[0])
-		set_tone(portlist, "dialpbx");
-	else
-		set_tone(portlist, "dialtone");
+	if (e_dialinginfo.id[0])
+	{
+		set_tone(portlist, "dialing");
+	} else
+	{
+		if (e_ext.number[0])
+			set_tone(portlist, "dialpbx");
+		else
+			set_tone(portlist, "dialtone");
+	}
 }
 
 /* join MESSAGE_PROCEEDING */
 void EndpointAppPBX::join_proceeding(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	new_state(EPOINT_STATE_IN_PROCEEDING);
 
@@ -3026,9 +2920,9 @@ void EndpointAppPBX::join_proceeding(struct port_list *portlist, int message_typ
 		/* connect / disconnect audio */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
 		if (e_ext.own_proceeding)
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 		else
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 		message_put(message);
 	}
 //			UCPY(e_join_tone, "proceeding");
@@ -3044,7 +2938,7 @@ void EndpointAppPBX::join_proceeding(struct port_list *portlist, int message_typ
 /* join MESSAGE_ALERTING */
 void EndpointAppPBX::join_alerting(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	new_state(EPOINT_STATE_IN_ALERTING);
 
@@ -3054,9 +2948,9 @@ void EndpointAppPBX::join_alerting(struct port_list *portlist, int message_type,
 		/* connect / disconnect audio */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
 		if (e_ext.own_alerting)
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 		else
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 		message_put(message);
 	}
 	if (portlist)
@@ -3079,38 +2973,26 @@ void EndpointAppPBX::join_alerting(struct port_list *portlist, int message_type,
 /* join MESSAGE_CONNECT */
 void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
-	struct interface	*interface;
+	struct lcr_msg *message;
 
 	new_state(EPOINT_STATE_CONNECT);
 //			UCPY(e_join_tone, "");
+//			
 	if (e_ext.number[0])
 		e_dtmf = 1; /* allow dtmf */
+
 	e_powerdialing = 0;
 	memcpy(&e_connectinfo, &param->connectinfo, sizeof(e_callerinfo));
 	if(portlist)
 	{
 		message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT);
 		memcpy(&message->param, param, sizeof(union parameter));
-		/* screen incoming caller id */
-		interface = interface_first;
-		while(interface)
-		{
-			if (!strcmp(e_connectinfo.interface, interface->name))
-			{
-				break;
-			}
-			interface = interface->next;
-		}
-		if (interface)
-			screen(1, e_connectinfo.id, sizeof(e_connectinfo.id), &e_connectinfo.ntype, &e_connectinfo.present, interface);
-		memcpy(&message->param.connectinfo, &e_connectinfo, sizeof(e_connectinfo));
 
 		/* screen clip if prefix is required */
 		if (e_ext.number[0] && message->param.connectinfo.id[0] && e_ext.clip_prefix[0])
 		{
 			SCPY(message->param.connectinfo.id, e_ext.clip_prefix);
-			SCAT(message->param.connectinfo.id, numberrize_callerinfo(e_connectinfo.id,e_connectinfo.ntype));
+			SCAT(message->param.connectinfo.id, numberrize_callerinfo(e_connectinfo.id,e_connectinfo.ntype, options.national, options.international));
 			message->param.connectinfo.ntype = INFO_NTYPE_UNKNOWN;
 		}
 
@@ -3122,13 +3004,13 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
 		}
 
 		/* handle restricted caller ids */
-		apply_callerid_restriction(e_ext.anon_ignore, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name);
+		apply_callerid_restriction(&e_ext, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name);
 		/* display callerid if desired for extension */
 		SCPY(message->param.connectinfo.display, apply_callerid_display(message->param.connectinfo.id, message->param.connectinfo.itype, message->param.connectinfo.ntype, message->param.connectinfo.present, message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name));
 
 		/* use conp, if enabld */
-		if (!e_ext.centrex)
-			message->param.connectinfo.name[0] = '\0';
+//		if (!e_ext.centrex)
+//			message->param.connectinfo.name[0] = '\0';
 
 		/* send connect */
 		message_put(message);
@@ -3137,7 +3019,7 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
 	set_tone(portlist, NULL);
 	e_join_pattern = 0;
 	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-	message->param.audiopath = CHANNEL_STATE_CONNECT;
+	message->param.audiopath = 1;
 	message_put(message);
 	e_start = now;
 }
@@ -3146,7 +3028,7 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
 void EndpointAppPBX::join_disconnect_release(int message_type, union parameter *param)
 {
 	char cause[16];
-	struct message *message;
+	struct lcr_msg *message;
 	struct port_list *portlist = NULL;
 
 
@@ -3243,7 +3125,7 @@ void EndpointAppPBX::join_disconnect_release(int message_type, union parameter *
 	} else /* else we enable audio */
 	{
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	}
 	/* send disconnect message */
@@ -3260,8 +3142,8 @@ void EndpointAppPBX::join_disconnect_release(int message_type, union parameter *
 /* join MESSAGE_SETUP */
 void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
-	struct interface	*interface;
+	struct lcr_msg *message;
+//	struct interface	*interface;
 
 	/* if we already in setup state, we just update the dialing with new digits */
 	if (e_state == EPOINT_STATE_OUT_SETUP
@@ -3285,7 +3167,7 @@ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, un
 
 			/* disconnect audio */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 			message_put(message);
 
 			/* get dialing info */
@@ -3358,19 +3240,6 @@ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, un
 	memcpy(&e_redirinfo, &param->setup.redirinfo, sizeof(e_redirinfo));
 	memcpy(&e_capainfo, &param->setup.capainfo, sizeof(e_capainfo));
 
-	/* screen incoming caller id */
-	interface = interface_first;
-	while(interface)
-	{
-		if (!strcmp(e_callerinfo.interface, interface->name))
-		{
-			break;
-		}
-		interface = interface->next;
-	}
-	if (interface)
-		screen(1, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, interface);
-
 	/* process (voice over) data calls */
 	if (e_ext.datacall && e_capainfo.bearer_capa!=INFO_BC_SPEECH && e_capainfo.bearer_capa!=INFO_BC_AUDIO)
 	{
@@ -3389,7 +3258,7 @@ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, un
 /* join MESSAGE_mISDNSIGNAL */
 void EndpointAppPBX::join_mISDNsignal(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	while(portlist)
 	{
@@ -3403,7 +3272,7 @@ void EndpointAppPBX::join_mISDNsignal(struct port_list *portlist, int message_ty
 /* join MESSAGE_NOTIFY */
 void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 	int new_state;
 
 	if (param->notifyinfo.notify)
@@ -3418,10 +3287,13 @@ void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, u
 				/* unhold if */
 				if (new_state!=NOTIFY_STATE_HOLD && new_state!=NOTIFY_STATE_SUSPEND)
 				{
-					while(portlist)
+					if (!strcmp(e_tone, "hold")) // don't interrupt other tones
 					{
-						set_tone(portlist, "");
-						portlist = portlist->next;
+						while(portlist)
+						{
+							set_tone(portlist, "");
+							portlist = portlist->next;
+						}
 					}
 					portlist = ea_endpoint->ep_portlist;
 					e_hold = 0;
@@ -3450,7 +3322,7 @@ void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, u
 		message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_NOTIFY);
 		memcpy(&message->param.notifyinfo, &param->notifyinfo, sizeof(struct notify_info));
 		/* handle restricted caller ids */
-		apply_callerid_restriction(e_ext.anon_ignore, message->param.notifyinfo.id, &message->param.notifyinfo.ntype, &message->param.notifyinfo.present, 0, message->param.notifyinfo.extension, NULL);
+		apply_callerid_restriction(&e_ext, message->param.notifyinfo.id, &message->param.notifyinfo.ntype, &message->param.notifyinfo.present, 0, message->param.notifyinfo.extension, NULL);
 		/* display callerid if desired for extension */
 		SCPY(message->param.notifyinfo.display, apply_callerid_display(message->param.notifyinfo.id, message->param.notifyinfo.itype, message->param.notifyinfo.ntype, message->param.notifyinfo.present, 0, message->param.notifyinfo.extension, NULL));
 		message_put(message);
@@ -3461,10 +3333,10 @@ void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, u
 
 /* JOIN sends messages to the endpoint
  */
-void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, union parameter *param)
+void EndpointAppPBX::ea_message_join(unsigned int join_id, int message_type, union parameter *param)
 {
 	struct port_list *portlist;
-	struct message *message;
+	struct lcr_msg *message;
 
 	if (!join_id)
 	{
@@ -3520,7 +3392,7 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un
 
 		/* JOIN sends OVERLAP message */
 		case MESSAGE_OVERLAP:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received 'more info available'\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received 'more info required'\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		if (e_state!=EPOINT_STATE_IN_SETUP
 		 && e_state!=EPOINT_STATE_IN_OVERLAP)
 		{
@@ -3586,6 +3458,7 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un
 		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);
@@ -3617,13 +3490,8 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un
 			}
 			/* connect our audio tx and rx (blueboxing should be possibe before connect :)*/
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 			message_put(message);
-//			/* tell remote epoint to connect audio also, because we like to hear the patterns */
-//			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_REMOTE_AUDIO);
-//			message->param.audiopath = CHANNEL_STATE_CONNECT;
-//			message_put(message);
-// patterns are available, remote already connected audio
 		}
 		break;
 
@@ -3636,7 +3504,7 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un
 			e_join_pattern = 0;
 			/* disconnect our audio tx and rx */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 			message_put(message);
 		}
 		break;
@@ -3657,6 +3525,15 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un
 		join_notify(portlist, message_type, param);
 		break;
 
+		/* JOIN wants keypad / dtml */
+		case MESSAGE_ENABLEKEYPAD:
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received keypad enable request.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		e_enablekeypad = 1;
+		e_dtmf = 1;
+		trace_header("ENABLE KEYPAD", DIRECTION_NONE);
+		end_trace();
+		break;
+
 		default:
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received a wrong message: #%d\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, message);
 	}
@@ -3703,7 +3580,7 @@ int match_list(char *list, char *item)
 
 void EndpointAppPBX::pick_join(char *extensions)
 {
-	struct message *message;
+	struct lcr_msg *message;
 	struct port_list *portlist;
 	class Port *port;
 	class EndpointAppPBX *eapp, *found;
@@ -3836,7 +3713,8 @@ reject:
 
 	/* connnecting our endpoint */
 	new_state(EPOINT_STATE_CONNECT);
-	e_dtmf = 1;
+	if (e_ext.number[0])
+		e_dtmf = 1;
 	set_tone(ea_endpoint->ep_portlist, NULL);
 
 	/* now we send a release to the ringing endpoint */
@@ -3862,14 +3740,14 @@ reject:
 	message->param.connectinfo.itype = eapp->e_callerinfo.itype;
 	message->param.connectinfo.ntype = eapp->e_callerinfo.ntype;
 	/* handle restricted caller ids */
-	apply_callerid_restriction(e_ext.anon_ignore, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name);
+	apply_callerid_restriction(&e_ext, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name);
 	/* display callerid if desired for extension */
 	SCPY(message->param.connectinfo.display, apply_callerid_display(message->param.connectinfo.id, message->param.connectinfo.itype,  message->param.connectinfo.ntype, message->param.connectinfo.present, message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name));
 	message_put(message);
 
 	/* we send a connect to the audio path (not for vbox) */
 	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-	message->param.audiopath = CHANNEL_STATE_CONNECT;
+	message->param.audiopath = 1;
 	message_put(message);
 
 	/* beeing paranoid, we make call update */
@@ -3909,7 +3787,7 @@ reject:
  */
 void EndpointAppPBX::join_join(void)
 {
-	struct message *message;
+	struct lcr_msg *message;
 	struct join_relation *our_relation, *other_relation;
 	struct join_relation **our_relation_pointer, **other_relation_pointer;
 	class Join *our_join, *other_join;
@@ -4029,12 +3907,12 @@ void EndpointAppPBX::join_join(void)
 	{
 		if (other_relation->epoint_id == other_eapp->ea_endpoint->ep_serial)
 		{
-		/* detach other endpoint on hold */
+			/* detach other endpoint on hold */
 			*other_relation_pointer = other_relation->next;
 			FREE(other_relation, sizeof(struct join_relation));
 			cmemuse--;
 			other_relation = *other_relation_pointer;
-			other_eapp->ea_endpoint->ep_join_id = NULL;
+			other_eapp->ea_endpoint->ep_join_id = 0;
 			continue;
 		}
 
@@ -4087,7 +3965,7 @@ void EndpointAppPBX::join_join(void)
 /* check if we have an external call
  * this is used to check for encryption ability
  */
-int EndpointAppPBX::check_external(char **errstr, class Port **port)
+int EndpointAppPBX::check_external(const char **errstr, class Port **port)
 {
 	struct join_relation *relation;
 	class Join *join;
@@ -4189,9 +4067,9 @@ int EndpointAppPBX::check_external(char **errstr, class Port **port)
 	return(0);
 }
 
-void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsigned long port_id, int dir)
+void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsigned int port_id, int dir)
 {
-	char *logtext = "unknown";
+	const char *logtext = "unknown";
 	char buffer[64];
 
 	switch(message_type)
@@ -4204,7 +4082,7 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 			add_trace("from", NULL, "CH(%lu)", port_id);
 		if (param->setup.callerinfo.extension[0])
 			add_trace("extension", NULL, "%s", param->setup.callerinfo.extension);
-		add_trace("caller id", "number", "%s", numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype));
+		add_trace("caller id", "number", "%s", numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, options.national, options.international));
 		switch(param->setup.callerinfo.present)
 		{
 		      	case INFO_PRESENT_RESTRICTED:
@@ -4218,7 +4096,7 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 		}
 		if (param->setup.redirinfo.id[0])
 		{
-			add_trace("redir'ing", "number", "%s", numberrize_callerinfo(param->setup.redirinfo.id, param->setup.redirinfo.ntype));
+			add_trace("redir'ing", "number", "%s", numberrize_callerinfo(param->setup.redirinfo.id, param->setup.redirinfo.ntype, options.national, options.international));
 			switch(param->setup.redirinfo.present)
 			{
 				case INFO_PRESENT_RESTRICTED:
@@ -4233,6 +4111,10 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 		}
 		if (param->setup.dialinginfo.id[0])
 			add_trace("dialing", NULL, "%s", param->setup.dialinginfo.id);
+		if (param->setup.dialinginfo.display[0])
+			add_trace("display", NULL, "%s", param->setup.dialinginfo.display);
+		if (param->setup.dialinginfo.sending_complete)
+			add_trace("complete", NULL, "true", param->setup.dialinginfo.sending_complete);
 		end_trace();
 		break;
 
@@ -4271,7 +4153,7 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 			add_trace("from", NULL, "CH(%lu)", port_id);
 		if (param->connectinfo.extension[0])
 			add_trace("extension", NULL, "%s", param->connectinfo.extension);
-		add_trace("connect id", "number", "%s", numberrize_callerinfo(param->connectinfo.id, param->connectinfo.ntype));
+		add_trace("connect id", "number", "%s", numberrize_callerinfo(param->connectinfo.id, param->connectinfo.ntype, options.national, options.international));
 		switch(param->connectinfo.present)
 		{
 		      	case INFO_PRESENT_RESTRICTED:
@@ -4283,6 +4165,8 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 		      	default:
 			add_trace("connect id", "present", "not available");
 		}
+		if (param->connectinfo.display[0])
+			add_trace("display", NULL, "%s", param->connectinfo.display);
 		end_trace();
 		break;
 
@@ -4312,10 +4196,10 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 			add_trace("cause", "location", "3-Transit");
 			break;
 			case LOCATION_PUBLIC_REMOTE:
-			add_trace("cause", "location", "4-Remote-PBX");
+			add_trace("cause", "location", "4-Remote-Exchange");
 			break;
 			case LOCATION_PRIVATE_REMOTE:
-			add_trace("cause", "location", "5-Remote-Exchange");
+			add_trace("cause", "location", "5-Remote-PBX");
 			break;
 			case LOCATION_INTERNATIONAL:
 			add_trace("cause", "location", "7-International-Exchange");
@@ -4326,6 +4210,8 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 			default:
 			add_trace("cause", "location", "%d", param->disconnectinfo.location);
 		}
+		if (param->disconnectinfo.display[0])
+			add_trace("display", NULL, "%s", param->disconnectinfo.display);
 		end_trace();
 		break;
 
@@ -4418,7 +4304,7 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 			add_trace("indicator", NULL, "%s", logtext);
 		if (param->notifyinfo.id[0])
 		{
-			add_trace("redir'on", "number", "%s", numberrize_callerinfo(param->notifyinfo.id, param->notifyinfo.ntype));
+			add_trace("redir'on", "number", "%s", numberrize_callerinfo(param->notifyinfo.id, param->notifyinfo.ntype, options.national, options.international));
 			switch(param->notifyinfo.present)
 			{
 				case INFO_PRESENT_RESTRICTED:
@@ -4442,7 +4328,12 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 			add_trace("to", NULL, "CH(%lu)", port_id);
 		if (dir == DIRECTION_IN)
 			add_trace("from", NULL, "CH(%lu)", port_id);
-		add_trace("dialing", NULL, "%s", param->information.id);
+		if (param->information.id[0])
+			add_trace("dialing", NULL, "%s", param->information.id);
+		if (param->information.display[0])
+			add_trace("display", NULL, "%s", param->information.display);
+		if (param->information.sending_complete)
+			add_trace("complete", NULL, "true", param->information.sending_complete);
 		end_trace();
 		break;
 
@@ -4517,9 +4408,9 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 	}
 }
 
-void EndpointAppPBX::message_disconnect_port(struct port_list *portlist, int cause, int location, char *display)
+void EndpointAppPBX::message_disconnect_port(struct port_list *portlist, int cause, int location, const char *display)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	if (!portlist)
 		return;