X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=ddfb2b08ccecbb4813ff87a878723aed466eb7dc;hp=bdec6985749331bcc9e89ea1351b7d74cf4b104f;hb=7dc10dcae129d2ef7f40a455aba45179eb68d1d8;hpb=a17752d887eb9eb975dce3453ab3d176a2818cb1

diff --git a/apppbx.cpp b/apppbx.cpp
index bdec698..ddfb2b0 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -42,8 +42,8 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint) : EndpointApp(epoint)
 	e_ext.rights = 4; /* international */
 	e_ext.rxvol = e_ext.txvol = 256;
         e_state = EPOINT_STATE_IDLE;
-        e_terminal[0] = '\0';
-	e_terminal_interface[0] = '\0';
+        e_ext.number[0] = '\0';
+	e_extension_interface[0] = '\0';
         memset(&e_callerinfo, 0, sizeof(struct caller_info));
         memset(&e_dialinginfo, 0, sizeof(struct dialing_info));
         memset(&e_connectinfo, 0, sizeof(struct connect_info));
@@ -135,13 +135,42 @@ EndpointAppPBX::~EndpointAppPBX(void)
 }
 
 
+/*
+ * trace header for application
+ */
+void EndpointAppPBX::trace_header(char *name, int direction)
+{
+	char msgtext[sizeof(trace.name)];
+
+	SCPY(msgtext, name);
+
+	/* init trace with given values */
+	start_trace(e_serial,
+		    NULL,
+		    nationalize(e_callerinfo.id, e_callerinfo.ntype),
+		    e_dialinginfo.number,
+		    direction,
+		    CATEGORY_EP,
+		    e_serial,
+		    msgtext);
+}
+
+
 EPOINT_STATE_NAMES
 
 /* set new endpoint state
  */
 void EndpointAppPBX::new_state(int state)
 {
-	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) new state %s --> %s\n", ea_endpoint->ep_serial, state_name[e_state], state_name[state]);
+#if 0
+	if (e_state != state)
+	{
+		trace_header("NEW STATE", DIRECTION_NONE);
+		add_trace("state", "old", "%s", state_name[e_state]);
+		add_trace("state", "new", "%s", state_name[state]);
+		end_trace();
+	}
+#endif
 	e_state = state;
 }
 
@@ -326,12 +355,12 @@ void EndpointAppPBX::release(int release, int calllocation, int callcause, int p
 			memcpy(&e_callbackinfo, &e_callerinfo, sizeof(e_callbackinfo));
 			memset(&e_dialinginfo, 0, sizeof(e_dialinginfo));
 			/* create dialing by callerinfo */
-			if (e_terminal[0] && e_terminal_interface[0])
+			if (e_ext.number[0] && e_extension_interface[0])
 			{
-				PDEBUG(DEBUG_EPOINT, "EPOINT(%d) preparing callback to internal: %s interface %s\n", ea_endpoint->ep_serial, e_terminal, e_terminal_interface);
+				PDEBUG(DEBUG_EPOINT, "EPOINT(%d) preparing callback to internal: %s interface %s\n", ea_endpoint->ep_serial, e_ext.number, e_extension_interface);
 				/* create callback to the current terminal */
-				SCPY(e_dialinginfo.number, e_terminal);
-				SCPY(e_dialinginfo.interfaces, e_terminal_interface);
+				SCPY(e_dialinginfo.number, e_ext.number);
+				SCPY(e_dialinginfo.interfaces, e_extension_interface);
 				e_dialinginfo.itype = INFO_ITYPE_ISDN_EXTENSION;
 				e_dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
 			} else
@@ -564,7 +593,7 @@ void EndpointAppPBX::keypad_function(char digit)
 {
 
 	/* we must be in a call, in order to send messages to the call */
-	if (e_terminal[0] == '\0')
+	if (e_ext.number[0] == '\0')
 	{
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) IGNORING keypad received not from extension.\n", ea_endpoint->ep_serial);
 		return;
@@ -675,7 +704,9 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 		if (!strcasecmp(interface->name, ifname))
 		{
 			/* found explicit interface */
-			printlog("%3d  interface %s found as given\n", ea_endpoint->ep_serial, ifname);
+			trace_header("CHANNEL SELECTION (found interface)", DIRECTION_NONE);
+			add_trace("interface", NULL, "%s", ifname);
+			end_trace();
 			goto found;
 		}
 
@@ -684,7 +715,9 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 		if (!interface->extension)
 		{
 			/* found non extension */
-			printlog("%3d  interface %s found, that is not an extension\n", ea_endpoint->ep_serial, interface->name);
+			trace_header("CHANNEL SELECTION (found non extension interface)", DIRECTION_NONE);
+			add_trace("interface", NULL, "%s", interface->name);
+			end_trace();
 			goto found;
 		}
 	}
@@ -696,7 +729,9 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 	if (!interface->ifport)
 	{
 		/* no ports */
-		printlog("%3d  interface %s has no active ports, skipping.\n", ea_endpoint->ep_serial, interface->name);
+		trace_header("CHANNEL SELECTION (interface has no active ports, skipping)", DIRECTION_NONE);
+		add_trace("interface", NULL, "%s", interface->name);
+		end_trace();
 		interface = interface->next;
 		goto checknext;
 	}
@@ -711,7 +746,10 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 			ifport_start = ifport_start->next;
 			i++;
 		}
-		printlog("%3d  starting with port#%d position %d (round-robin)\n", ea_endpoint->ep_serial, ifport_start->portnum, 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 */
@@ -721,7 +759,10 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 	/* see if port is available */
 	if (!ifport->mISDNport)
 	{
-		printlog("%3d  port#%d position %d is not available, skipping.\n", ea_endpoint->ep_serial, ifport->portnum, index);
+		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;
@@ -731,15 +772,20 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 	/* see if port is administratively blocked */
 	if (ifport->block)
 	{
-		printlog("%3d  port#%d position %d is administratively blocked, skipping.\n", ea_endpoint->ep_serial, ifport->portnum, index);
+		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 */
 	if (mISDNport->ptp && !mISDNport->l2link)
 	{
-		printlog("%3d  port#%d position %d is ptp but layer 2 is down.\n", ea_endpoint->ep_serial, ifport->portnum, index);
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) skipping because it is PTP with L2 down\n", ea_endpoint->ep_serial);
+		trace_header("CHANNEL SELECTION (port is ptp with layer 2 down, skipping)", DIRECTION_NONE);
+		add_trace("port", NULL, "%d", ifport->portnum);
+		add_trace("position", NULL, "%d", index);
+		end_trace();
 		goto portbusy;
 	}
 
@@ -760,7 +806,11 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 				if (mISDNport->b_port[i] == NULL)
 				{
 					*channel = i+1+(i>=15);
-					printlog("%3d  port#%d position %d selecting free channel %d\n", ea_endpoint->ep_serial, ifport->portnum, index, *channel);
+					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++;
@@ -772,12 +822,18 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 			{
 				break; /* all channel in use or reserverd */
 			}
-			printlog("%3d  port#%d position %d using with 'any channel'\n", ea_endpoint->ep_serial, ifport->portnum, index);
+			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 = SEL_CHANNEL_ANY;
 			break;
 
 			case CHANNEL_NO: /* call waiting */
-			printlog("%3d  port#%d position %d using with 'no channel'\n", ea_endpoint->ep_serial, ifport->portnum, index);
+			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 = SEL_CHANNEL_NO;
 			break;
 
@@ -790,7 +846,11 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 			if (mISDNport->b_port[i] == NULL)
 			{
 				*channel = selchannel->channel;
-				printlog("%3d  port#%d position %d selecting given channel %d\n", ea_endpoint->ep_serial, ifport->portnum, index, *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;
@@ -815,7 +875,10 @@ static struct mISDNport *EndpointAppPBX::hunt_port(char *ifname, int *channel)
 		return(mISDNport);
 	}
 
-	printlog("%3d  port#%d position %d skipping, because no channel found.\n", ea_endpoint->ep_serial, ifport->portnum, index);
+	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 */
@@ -889,7 +952,7 @@ void EndpointAppPBX::out_setup(void)
 			while(atemp)
 			{
 				if (atemp != this)
-				if (!strcmp(atemp->e_terminal, e_terminal))
+				if (!strcmp(atemp->e_ext.number, e_ext.number))
 					break;
 				atemp = atemp->next;
 			}
@@ -943,7 +1006,7 @@ void EndpointAppPBX::out_setup(void)
 			{
 				if (checkapp != this) /* any other endpoint except our own */
 				{
-					if (!strcmp(checkapp->e_terminal, e_terminal))
+					if (!strcmp(checkapp->e_ext.number, e_ext.number))
 					{
 						/* present to forwarded party */
 						if (e_ext.anon_ignore && e_callerinfo.id[0])
@@ -997,8 +1060,9 @@ void EndpointAppPBX::out_setup(void)
 			mISDNport = hunt_port(ifname, &channel);
 			if (!mISDNport)
 			{
-				printlog("%3d  endpoint INTERFACE '%s' not found or busy\n", ea_endpoint->ep_serial, ifname);
-				PDEBUG(DEBUG_EPOINT, "EPOINT(%d) given interface: '%s' not found or too busy to accept calls.\n", ea_endpoint->ep_serial, e_ext.interfaces);
+				trace_header("INTERFACE (not found or busy)", DIRECTION_NONE);
+				add_trace("interface", NULL, "%s", ifname);
+				end_trace();
 				continue;
 			}
 			/* creating INTERNAL port */
@@ -1037,7 +1101,7 @@ void EndpointAppPBX::out_setup(void)
 			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_terminal);
+//terminal			SCPY(message->param.setup.from_terminal, e_ext.number);
 //terminal			if (e_dialinginfo.number)
 //terminal				SCPY(message->param.setup.to_terminal, e_dialinginfo.number);
 			/* handle restricted caller ids */
@@ -1087,7 +1151,7 @@ void EndpointAppPBX::out_setup(void)
 		{
 			/* only if vbox should be dialed, and terminal is given */
 			earlyb = 0;
-			if (!strcmp(p, "vbox") && e_terminal[0])
+			if (!strcmp(p, "vbox") && e_ext.number[0])
 			{
 				/* go to the end of p */
 				p += strlen(p);
@@ -1101,7 +1165,7 @@ void EndpointAppPBX::out_setup(void)
 					break;
 				}
 				PDEBUG(DEBUG_EPOINT, "EPOINT(%d) allocated port %s\n", ea_endpoint->ep_serial, port->p_name);
-				UCPY(cfp, e_terminal); /* cfp or any other direct forward/vbox */
+				UCPY(cfp, e_ext.number); /* cfp or any other direct forward/vbox */
 			} else
 			{
 				cfp[0] = '\0';
@@ -1125,8 +1189,9 @@ void EndpointAppPBX::out_setup(void)
 						/* if PTP, skip all down links */
 						if (mISDNport->ptp && !mISDNport->l2link)
 						{
-							printlog("%3d  endpoint INTERFACE Layer 2 of interface '%s' is down.\n", ea_endpoint->ep_serial, mISDNport->interface_name);
-							PDEBUG(DEBUG_EPOINT, "EPOINT(%d) skipping because it is PTP with L2 down\n", ea_endpoint->ep_serial);
+							trace_header("INTERFACE (layer 2 is down)", DIRECTION_NONE);
+							add_trace("interface", NULL, "%s", mISDNport->interface_name);
+							end_trace();
 							mISDNport = mISDNport->next;
 							continue;
 						}
@@ -1144,14 +1209,17 @@ void EndpointAppPBX::out_setup(void)
 							}
 							if (use >= mISDNport->b_num)
 							{
-								printlog("%3d  endpoint INTERFACE Interface '%s' has no free channel.\n", ea_endpoint->ep_serial, mISDNport->interface_name);
-								PDEBUG(DEBUG_EPOINT, "EPOINT(%d) skipping because it is not single link port_list NT-modem OR no channel available.\n", ea_endpoint->ep_serial);
+								trace_header("INTERFACE (no free channel)", DIRECTION_NONE);
+								add_trace("interface", NULL, "%s", mISDNport->interface_name);
+								end_trace();
 								mISDNport = mISDNport->next;
 								continue;
 							}
 						}
 						/* found interface */
-						printlog("%3d  endpoint INTERFACE Interface '%s' found for external call.\n", ea_endpoint->ep_serial, mISDNport->interface_name);
+						trace_header("INTERFACE (found)", DIRECTION_NONE);
+						add_trace("interface", NULL, "%s", mISDNport->interface_name);
+						end_trace();
 						break;
 					}
 					mISDNport = mISDNport->next;
@@ -1165,8 +1233,9 @@ void EndpointAppPBX::out_setup(void)
 				} else
 				{
 					port = NULL;
-					printlog("%3d  endpoint INTERFACE External interface not found or busy.\n", ea_endpoint->ep_serial);
-					PDEBUG(DEBUG_EPOINT, "EPOINT(%d) given interface: '%s' too busy to accept calls.\n", ea_endpoint->ep_serial, e_dialinginfo.interfaces[0]?e_dialinginfo.interfaces:"any interface");
+					trace_header("INTERFACE (too busy)", DIRECTION_NONE);
+					add_trace("interface", NULL, "%s", e_dialinginfo.interfaces[0]?e_dialinginfo.interfaces:"any interface");
+					end_trace();
 				}
 			}
 			if (!port)
@@ -1195,12 +1264,12 @@ void EndpointAppPBX::out_setup(void)
 			if (e_ext.clip==CLIP_HIDE && port->p_type!=PORT_TYPE_VBOX_OUT)
 			{
 				SCPY(message->param.setup.callerinfo.id, e_ext.callerid);
-				SCPY(message->param.setup.callerinfo.intern, e_terminal);
+				SCPY(message->param.setup.callerinfo.intern, e_ext.number);
 				message->param.setup.callerinfo.ntype = e_ext.callerid_type;
 				message->param.setup.callerinfo.present = e_ext.callerid_present;
 			}
 			memcpy(&message->param.setup.capainfo, &e_capainfo, sizeof(struct capa_info));
-//terminal			SCPY(message->param.setup.from_terminal, e_terminal);
+//terminal			SCPY(message->param.setup.from_terminal, e_ext.number);
 //terminal			if (e_dialinginfo.number)
 //terminal				SCPY(message->param.setup.to_terminal, e_dialinginfo.number);
 				/* handle restricted caller ids */
@@ -1217,8 +1286,8 @@ void EndpointAppPBX::out_setup(void)
 		/* now we have all ports created */
 		if (!anycall)
 		{
-			printlog("%3d  endpoint INTERFACE No port or no parallel forwarding defined. Nothing to call to.\n", ea_endpoint->ep_serial);
-			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) no port or no cfp defined for extension, nothing to dial.\n", ea_endpoint->ep_serial);
+			trace_header("INTERFACE (no extension's interface)", DIRECTION_NONE);
+			end_trace();
 			if (!ea_endpoint->ep_call_id)
 				break;
 			release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, cause, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL); /* RELEASE_TYPE, call, port */
@@ -1253,8 +1322,9 @@ void EndpointAppPBX::out_setup(void)
 					/* if PTP, skip all down links */
 					if (mISDNport->ptp && !mISDNport->l2link)
 					{
-						printlog("%3d  endpoint INTERFACE Layer 2 of interface '%s' is down.\n", ea_endpoint->ep_serial, mISDNport->interface_name);
-						PDEBUG(DEBUG_EPOINT, "EPOINT(%d) skipping because it is PTP with L2 down\n", ea_endpoint->ep_serial);
+						trace_header("INTERFACE (layer 2 is down)", DIRECTION_NONE);
+						add_trace("interface", NULL, "%s", mISDNport->interface_name);
+						end_trace();
 						mISDNport = mISDNport->next;
 						continue;
 					}
@@ -1272,22 +1342,26 @@ void EndpointAppPBX::out_setup(void)
 						}
 						if (use >= mISDNport->b_num)
 						{
-							printlog("%3d  endpoint INTERFACE Interface '%s' has no free channel.\n", ea_endpoint->ep_serial, mISDNport->interface_name);
-							PDEBUG(DEBUG_EPOINT, "EPOINT(%d) skipping because it is not single link port_list NT-modem OR no channel available.\n", ea_endpoint->ep_serial);
+							trace_header("INTERFACE (no free channel)", DIRECTION_NONE);
+							add_trace("interface", NULL, "%s", mISDNport->interface_name);
+							end_trace();
 							mISDNport = mISDNport->next;
 							continue;
 						}
 					}
 					/* found interface */
-					printlog("%3d  endpoint INTERFACE Interface '%s' found for external call.\n", ea_endpoint->ep_serial, mISDNport->interface_name);
+					trace_header("INTERFACE (found)", DIRECTION_NONE);
+					add_trace("interface", NULL, "%s", mISDNport->interface_name);
+					end_trace();
 					break;
 				}
 				mISDNport = mISDNport->next;
 			}
 			if (!mISDNport)
 			{
-				printlog("%3d  endpoint INTERFACE External interface not found or busy.\n", ea_endpoint->ep_serial);
-				PDEBUG(DEBUG_EPOINT, "EPOINT(%d) given interface: '%s' too busy to accept calls.\n", ea_endpoint->ep_serial, e_dialinginfo.interfaces[0]?e_dialinginfo.interfaces:"any interface");
+				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*/
@@ -1295,8 +1369,8 @@ void EndpointAppPBX::out_setup(void)
 			port = new Pdss1((mISDNport->ntmode)?PORT_TYPE_DSS1_NT_OUT:PORT_TYPE_DSS1_TE_OUT, mISDNport, portname, &port_settings);
 			if (!port)	
 			{
-				PDEBUG(DEBUG_EPOINT, "EPOINT(%d) no external port available\n", ea_endpoint->ep_serial);
-				goto check_anycall_extern;
+				PERROR("EPOINT(%d) no memory for external port, exitting\n", ea_endpoint->ep_serial);
+				exit(-1);
 			}
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) created port %s\n", ea_endpoint->ep_serial, port->p_name);
 			memset(&dialinginfo, 0, sizeof(dialinginfo));
@@ -1318,7 +1392,7 @@ void EndpointAppPBX::out_setup(void)
 			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_terminal);
+//terminal			SCPY(message->param.setup.from_terminal, e_ext.number);
 //terminal			if (e_dialinginfo.number)
 //terminal				SCPY(message->param.setup.to_terminal, e_dialinginfo.number);
 				/* handle restricted caller ids */
@@ -1335,8 +1409,8 @@ void EndpointAppPBX::out_setup(void)
 		/* now we have all ports created */
 		if (!anycall)
 		{
-			printlog("%3d  endpoint INTERFACE No free port found for making any call.\n", ea_endpoint->ep_serial);
-			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) no port found which is idle for at least one number\n", ea_endpoint->ep_serial);
+			trace_header("INTERFACE (no free ports found)", DIRECTION_NONE);
+			end_trace();
 			if (!ea_endpoint->ep_call_id)
 				break;
 			release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NOCHANNEL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL); /* RELEASE_TYPE, call, port */
@@ -1500,7 +1574,8 @@ int EndpointAppPBX::handler(void)
 	        		e_rule = e_ruleset->rule_first;
 			e_action = NULL;
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) password timeout %s\n", ea_endpoint->ep_serial, e_extdialing);
-			printlog("%3d  endpoint PASSWORD timeout\n", ea_endpoint->ep_serial);
+			trace_header("PASSWORD timeout", DIRECTION_NONE);
+			end_trace();
 			e_connectedmode = 0;
 			e_dtmf = 0;
 			new_state(EPOINT_STATE_OUT_DISCONNECT);
@@ -1527,8 +1602,8 @@ void EndpointAppPBX::hookflash(void)
 	notify_active();
 	e_tx_state = NOTIFY_STATE_ACTIVE;
 
-	printlog("%3d  endpoint HOOKFLASH\n", ea_endpoint->ep_serial);
-	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) dtmf hookflash detected.\n", ea_endpoint->ep_serial);
+	trace_header("HOOKFLASH DTMF", DIRECTION_NONE);
+	end_trace();
 	if (ea_endpoint->ep_use > 1)
 	{
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot hooflash while child process is running.\n", ea_endpoint->ep_serial);
@@ -1603,37 +1678,43 @@ colp, outclip, outcolp
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) incoming call is extension\n", ea_endpoint->ep_serial);
 		/* port makes call from extension */
 		SCPY(e_callerinfo.intern, e_callerinfo.id);
-		SCPY(e_terminal, e_callerinfo.intern);
-		SCPY(e_terminal_interface, e_callerinfo.interface);
+		SCPY(e_ext.number, e_callerinfo.intern);
+		SCPY(e_extension_interface, e_callerinfo.interface);
 	} else
 	{
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) incoming call is external or voip\n", ea_endpoint->ep_serial);
 	}
-	printlog("%3d  incoming %s='%s'%s%s%s%s dialing='%s'\n",
-		ea_endpoint->ep_serial,
-		(e_callerinfo.intern[0])?"SETUP from extension":"SETUP from extern",
-		(e_callerinfo.intern[0])?e_callerinfo.intern:e_callerinfo.id,
-		(e_callerinfo.present==INFO_PRESENT_RESTRICTED)?" anonymous":"",
-		(e_redirinfo.id[0])?"redirected='":"",
-		e_redirinfo.id,
-		(e_redirinfo.id[0])?"'":"",
-		e_dialinginfo.number
-		);
+	trace_header("SETUP", DIRECTION_IN);
+	if (e_callerinfo.intern[0])
+		add_trace("extension", NULL, "%s", e_callerinfo.intern);
+	add_trace("caller id", "number", "%s", numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype));
+	if (e_callerinfo.present == INFO_PRESENT_RESTRICTED)
+		add_trace("caller id", "present", "restricted");
+	if (e_redirinfo.id[0])
+	{
+		add_trace("redir'ing", "number", "%s", numberrize_callerinfo(e_redirinfo.id, e_redirinfo.ntype));
+		if (e_redirinfo.present == INFO_PRESENT_RESTRICTED)
+			add_trace("redir'ing", "present", "restricted");
+	}
+	if (e_dialinginfo.number)
+		add_trace("dialing", "number", "%s", e_dialinginfo.number));
+	end_trace();
 
 	if (e_callerinfo.itype == INFO_ITYPE_INTERN)
 	{
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) call from extension '%s'\n", ea_endpoint->ep_serial, e_terminal);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) call from extension '%s'\n", ea_endpoint->ep_serial, e_ext.number);
 
 		/* get extension's info about caller */
-		if (!read_extension(&e_ext, e_terminal))
+		if (!read_extension(&e_ext, e_ext.number))
 		{
 			/* extension doesn't exist */
-			printlog("%3d  endpoint EXTENSION '%s' doesn't exist, please check or create.\n", ea_endpoint->ep_serial, e_callerinfo.id);
-			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) rejecting call from not existing extension: '%s'\n", ea_endpoint->ep_serial, e_terminal);
+			trace_header("EXTENSION (not created)", DIRECTION_IN);
+			add_trace("extension", NULL, "%s", e_ext.number);
+			end_trace();
 			message_disconnect_port(portlist, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, "");
 			new_state(EPOINT_STATE_OUT_DISCONNECT);
 			set_tone(portlist, "cause_80"); /* pbx cause: extension not authorized */
-			e_terminal[0] = '\0'; /* no terminal */
+			e_ext.number[0] = '\0'; /* no terminal */
 			return;
 		}
 		writeext = 0;
@@ -1678,7 +1759,7 @@ colp, outclip, outcolp
 
 		/* extension is written */
 		if (writeext)
-			write_extension(&e_ext, e_terminal);
+			write_extension(&e_ext, e_ext.number);
 
 		/* set volume of rx and tx */
 		if (param->setup.callerinfo.itype == INFO_ITYPE_INTERN)
@@ -1695,21 +1776,21 @@ colp, outclip, outcolp
 		if (e_ext.record!=CODEC_OFF && (e_capainfo.bearer_capa==INFO_BC_SPEECH || e_capainfo.bearer_capa==INFO_BC_AUDIO))
 		{
 			/* check if we are a terminal */
-			if (e_terminal[0] == '\0')
+			if (e_ext.number[0] == '\0')
 				PERROR("Port(%d) cannot record because we are not a terminal\n", ea_endpoint->ep_serial);
 			else
 			{
 				port = find_port_id(portlist->port_id);
 				if (port)
-					port->open_record(e_ext.record, 0, 0, e_terminal, e_ext.anon_ignore, "", 0);
+					port->open_record(e_ext.record, 0, 0, e_ext.number, e_ext.anon_ignore, "", 0);
 			}
 		}
 	} else
 	{
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) call from external port\n", ea_endpoint->ep_serial);
 		/* no terminal identification */
-		e_terminal[0] = '\0';
-		e_terminal_interface[0] = '\0';
+		e_ext.number[0] = '\0';
+		e_extension_interface[0] = '\0';
 		memset(&e_ext, 0, sizeof(e_ext));
 		e_ext.rights = 4; /* right to dial internat */
 	}
@@ -1726,7 +1807,7 @@ colp, outclip, outcolp
 		set_tone(portlist, "dialing");
 	} else
 	{
-		if (e_terminal[0])
+		if (e_ext.number[0])
 			set_tone(portlist, "dialpbx");
 		else
 			set_tone(portlist, "dialtone");
@@ -1745,16 +1826,17 @@ colp, outclip, outcolp
 /* port MESSAGE_INFORMATION */
 void EndpointAppPBX::port_information(struct port_list *portlist, int message_type, union parameter *param)
 {
-	printlog("%3d  incoming INFORMATION information='%s'\n",
-		ea_endpoint->ep_serial,
-		param->information.number
-		);
+	trace_header("INFORMATION", DIRECTION_IN);
+	add_trace("dialing", NULL, "%s", param->information.number);
+	if (param->information.sending_complete)
+		add_trace("complete", NULL, NULL);
+	end_trace();
 	e_overlap = 1;
 
 	/* turn off dtmf detection, in case dtmf is sent with keypad information */
 	if (e_dtmf)
 	{
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) received dialing information, so dtmf is now disabled, to prevent double detection by keypad+dtmf.\n", ea_endpoint->ep_serial, param->information.number, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) received dialing information, so dtmf is now disabled, to prevent double detection by keypad+dtmf.\n", ea_endpoint->ep_serial, param->information.number, e_ext.number, e_callerinfo.id);
 		e_dtmf = 0;
 	}
 
@@ -1821,10 +1903,9 @@ void EndpointAppPBX::port_information(struct port_list *portlist, int message_ty
 /* port MESSAGE_DTMF */
 void EndpointAppPBX::port_dtmf(struct port_list *portlist, int message_type, union parameter *param)
 {
-	printlog("%3d  incoming DTMF digit='%c'\n",
-		ea_endpoint->ep_serial,
-		param->dtmf
-		);
+	trace_header("DTMF", DIRECTION_IN);
+	add_trace("digit", NULL, "%c", param->dtmf);
+	end_trace();
 	/* only if dtmf detection is enabled */
 	if (!e_dtmf)
 	{
@@ -1954,9 +2035,8 @@ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type,
 	/* signal to call tool */
 	admin_call_response(e_adminid, ADMIN_CALL_SETUP_ACK, "", 0, 0, 0);
 
-	printlog("%3d  incoming SETUP ACKNOWLEDGE\n",
-		ea_endpoint->ep_serial
-		);
+	trace_header("SETUP ACKNOWLEDGE", DIRECTION_IN);
+	end_trace();
 	if (e_dialing_queue[0] && portlist)
 	{
 		/* send what we have not dialed yet, because we had no setup complete */
@@ -2008,9 +2088,8 @@ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_typ
 	/* signal to call tool */
 	admin_call_response(e_adminid, ADMIN_CALL_PROCEEDING, "", 0, 0, 0);
 
-	printlog("%3d  incoming PROCEEDING\n",
-		ea_endpoint->ep_serial
-		);
+	trace_header("PROCEEDING", DIRECTION_IN);
+	end_trace();
 	e_state = EPOINT_STATE_OUT_PROCEEDING;
 	/* check if pattern is availatle */
 	if (!ea_endpoint->ep_portlist->next && (portlist->earlyb || portlist->port_type==PORT_TYPE_VBOX_OUT)) /* one port_list relation and tones available */
@@ -2051,9 +2130,8 @@ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type,
 	/* signal to call tool */
 	admin_call_response(e_adminid, ADMIN_CALL_ALERTING, "", 0, 0, 0);
 
-	printlog("%3d  incoming ALERTING\n",
-		ea_endpoint->ep_serial
-		);
+	trace_header("ALERTING", DIRECTION_IN);
+	end_trace();
 	new_state(EPOINT_STATE_OUT_ALERTING);
 	/* check if pattern is available */
 	if (!ea_endpoint->ep_portlist->next && (portlist->earlyb || portlist->port_type==PORT_TYPE_VBOX_OUT)) /* one port_list relation and tones available */
@@ -2099,11 +2177,13 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 	admin_call_response(e_adminid, ADMIN_CALL_CONNECT, numberrize_callerinfo(param->connectinfo.id,param->connectinfo.ntype), 0, 0, 0);
 
 	memcpy(&e_connectinfo, &param->connectinfo, sizeof(e_connectinfo));
-	printlog("%3d  incoming CONNECT id='%s'%s\n",
-		ea_endpoint->ep_serial,
-		(e_connectinfo.intern[0])?e_connectinfo.intern:e_connectinfo.id,
-		(e_connectinfo.present==INFO_PRESENT_RESTRICTED)?" anonymous":""
-		);
+	trace_header("CONNECT", DIRECTION_IN);
+	if (e_connectinfo.intern[0])
+		add_trace("extension", NULL, "%s", e_connectinfo.intern);
+	add_trace("connect id", "number", "%s", numberrize_callerinfo(e_connectinfo.id, e_connectinfo.ntype));
+	if (e_connectinfo.present == INFO_PRESENT_RESTRICTED)
+		add_trace("connect id", "present", "restricted");
+	end_trace();
 	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) removing all other ports (start)\n", ea_endpoint->ep_serial);
 	while(ea_endpoint->ep_portlist->next) /* as long as we have at least two ports */
 	{
@@ -2138,16 +2218,16 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 		SCPY(e_connectinfo.name, e_ext.name);
 
 	/* add internal id to colp */
-	SCPY(e_connectinfo.intern, e_terminal);
+	SCPY(e_connectinfo.intern, e_ext.number);
 
 	/* we store the connected port number */
-	SCPY(e_terminal_interface, e_connectinfo.interfaces);
+	SCPY(e_extension_interface, e_connectinfo.interfaces);
 
 	/* for internal and am calls, we get the extension's id */
 	if (portlist->port_type==PORT_TYPE_VBOX_OUT || e_ext.colp==COLP_HIDE)
 	{
 		SCPY(e_connectinfo.id, e_ext.callerid);
-		SCPY(e_connectinfo.intern, e_terminal);
+		SCPY(e_connectinfo.intern, e_ext.number);
 		e_connectinfo.itype = INFO_ITYPE_INTERN;
 		e_connectinfo.ntype = e_ext.callerid_type;
 		e_connectinfo.present = e_ext.callerid_present;
@@ -2171,7 +2251,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 	}
 
 	e_cfnr_call = e_cfnr_release = 0;
-	if (e_terminal[0])
+	if (e_ext.number[0])
 		e_dtmf = 1; /* allow dtmf */
 //		if (call_countrelations(ea_endpoint->ep_call_id) == 2)
 	{
@@ -2203,15 +2283,15 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 	{
 		/* callback */
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) we have a callback, so we create a call with cbcaller: \"%s\".\n", ea_endpoint->ep_serial, e_cbcaller);
-		SCPY(e_terminal, e_cbcaller);
+		SCPY(e_ext.number, e_cbcaller);
 		new_state(EPOINT_STATE_IN_OVERLAP);
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) callback from extension '%s'\n", ea_endpoint->ep_serial, e_terminal);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) callback from extension '%s'\n", ea_endpoint->ep_serial, e_ext.number);
 
 		/* get extension's info about terminal */
-		if (!read_extension(&e_ext, e_terminal))
+		if (!read_extension(&e_ext, e_ext.number))
 		{
 			/* extension doesn't exist */
-			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) rejecting callback from not existing extension: '%s'\n", ea_endpoint->ep_serial, e_terminal);
+			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) rejecting callback from not existing extension: '%s'\n", ea_endpoint->ep_serial, e_ext.number);
 			message_disconnect_port(portlist, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, "");
 			new_state(EPOINT_STATE_OUT_DISCONNECT);
 			set_tone(portlist, "cause_80"); /* pbx cause: extension not authorized */
@@ -2226,7 +2306,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 
 		/* use caller id (or if exist: id_next_call) for this call */
 		e_callerinfo.screen = INFO_SCREEN_NETWORK;
-		SCPY(e_callerinfo.intern, e_terminal);
+		SCPY(e_callerinfo.intern, e_ext.number);
 		if (e_ext.id_next_call_present >= 0)
 		{
 			SCPY(e_callerinfo.id, e_ext.id_next_call);
@@ -2234,7 +2314,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 			e_callerinfo.ntype = e_ext.id_next_call_type;
 			e_ext.id_next_call_present = -1;
 			/* extension is written */
-			write_extension(&e_ext, e_terminal);
+			write_extension(&e_ext, e_ext.number);
 		} else
 		{
 			SCPY(e_callerinfo.id, e_ext.callerid);
@@ -2246,7 +2326,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 		e_dtmf = 1;
 
 		/* check if caller id is NOT authenticated */
-		if (!parse_callbackauth(e_terminal, &e_callbackinfo))
+		if (!parse_callbackauth(e_ext.number, &e_callbackinfo))
 		{
 			/* make call state to enter password */
 			new_state(EPOINT_STATE_IN_OVERLAP);
@@ -2280,16 +2360,16 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 	}
 
 	/* start recording if enabled, not when answering machine answers */
-	if (param->connectinfo.itype!=INFO_ITYPE_VBOX && e_terminal[0] && e_ext.record!=CODEC_OFF && (e_capainfo.bearer_capa==INFO_BC_SPEECH || e_capainfo.bearer_capa==INFO_BC_AUDIO))
+	if (param->connectinfo.itype!=INFO_ITYPE_VBOX && e_ext.number[0] && e_ext.record!=CODEC_OFF && (e_capainfo.bearer_capa==INFO_BC_SPEECH || e_capainfo.bearer_capa==INFO_BC_AUDIO))
 	{
 		/* check if we are a terminal */
-		if (e_terminal[0] == '\0')
+		if (e_ext.number[0] == '\0')
 			PERROR("Port(%d) cannot record because we are not a terminal\n", ea_endpoint->ep_serial);
 		else
 		{
 			port = find_port_id(portlist->port_id);
 			if (port)
-				port->open_record(e_ext.record, 0, 0, e_terminal, e_ext.anon_ignore, "", 0);
+				port->open_record(e_ext.record, 0, 0, e_ext.number, e_ext.anon_ignore, "", 0);
 		}
 	}
 }
@@ -2306,14 +2386,10 @@ void EndpointAppPBX::port_disconnect_release(struct port_list *portlist, int mes
 	/* signal to call tool */
 	admin_call_response(e_adminid, (message_type==MESSAGE_DISCONNECT)?ADMIN_CALL_DISCONNECT:ADMIN_CALL_RELEASE, "", param->disconnectinfo.cause, param->disconnectinfo.location, 0);
 
-	printlog("%3d  incoming %s cause='%d' (%s) location='%d' (%s)\n",
-		ea_endpoint->ep_serial,
-		(message_type==MESSAGE_DISCONNECT)?"DISCONNECT":"RELEASE",
-		param->disconnectinfo.cause,
-		(param->disconnectinfo.cause>0 && param->disconnectinfo.cause<128)?isdn_cause[param->disconnectinfo.cause].english:"-",
-		param->disconnectinfo.location,
-		(param->disconnectinfo.location>=0 && param->disconnectinfo.location<16)?isdn_location[param->disconnectinfo.location].english:"-"
-		);
+	trace_header((message_type==MESSAGE_DISCONNECT)?"DISCONNECT":"RELEASE", DIRECTION_IN);
+	add_trace("cause", "value", "%d", param->disconnectinfo.cause);
+	add_trace("cause", "location", "%d", param->disconnectinfo.location);
+	end_trace();
 
 //#warning does this work? only disconnect when incoming port hat not already disconnected yet?
 	if (e_state==EPOINT_STATE_IN_DISCONNECT && message_type!=MESSAGE_RELEASE)// || e_state==EPOINT_STATE_OUT_DISCONNECT || e_state==EPOINT_STATE_IDLE)
@@ -2444,48 +2520,57 @@ void EndpointAppPBX::port_timeout(struct port_list *portlist, int message_type,
 {
 	char cause[16];
 
-	printlog("%3d  incoming TIMEOUT\n",
-		ea_endpoint->ep_serial
-		);
+	trace_header("TIMEOUT", DIRECTION_IN);
 	message_type = MESSAGE_DISCONNECT;
 	switch (param->state)
 	{
 		case PORT_STATE_OUT_SETUP:
 		case PORT_STATE_OUT_OVERLAP:
+		add_trace("state", NULL, "outgoing setup/dialing");
+		end_trace();
 		/* no user responding */
 		release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NOUSER, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
 		return; /* must exit here */
 
 		case PORT_STATE_IN_SETUP:
 		case PORT_STATE_IN_OVERLAP:
+		add_trace("state", NULL, "incoming setup/dialing");
 		param->disconnectinfo.cause = CAUSE_INVALID; /* number incomplete */
 		param->disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
 		break;
 
 		case PORT_STATE_OUT_PROCEEDING:
+		add_trace("state", NULL, "outgoing proceeding");
+		end_trace();
 		param->disconnectinfo.cause = CAUSE_NOUSER; /* no user responding */
 		param->disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
 		release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NOUSER, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
 		return; /* must exit here */
 
 		case PORT_STATE_IN_PROCEEDING:
+		add_trace("state", NULL, "incoming proceeding");
 		param->disconnectinfo.cause = CAUSE_NOUSER;
 		param->disconnectinfo.location = LOCATION_PRIVATE_LOCAL; /* no user responding */
 		break;
 
 		case PORT_STATE_OUT_ALERTING:
+		add_trace("state", NULL, "outgoing alerting");
+		end_trace();
 		param->disconnectinfo.cause = CAUSE_NOANSWER; /* no answer */
 		param->disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
 		release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NOANSWER, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
 		return; /* must exit here */
 
 		case PORT_STATE_IN_ALERTING:
+		add_trace("state", NULL, "incoming alerting");
 		param->disconnectinfo.cause = CAUSE_NOANSWER;
 		param->disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
 		break;
 
 		case PORT_STATE_IN_DISCONNECT:
 		case PORT_STATE_OUT_DISCONNECT:
+		add_trace("state", NULL, "disconnect");
+		end_trace();
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) in this special case, we release due to disconnect timeout.\n", ea_endpoint->ep_serial);
 		release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
 		return; /* must exit here */
@@ -2494,6 +2579,7 @@ void EndpointAppPBX::port_timeout(struct port_list *portlist, int message_type,
 		param->disconnectinfo.cause = 31; /* normal unspecified */
 		param->disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
 	}
+	end_trace();
 	/* release call, disconnect isdn */
 	e_call_pattern = 0;
 	new_state(EPOINT_STATE_OUT_DISCONNECT);
@@ -2638,16 +2724,22 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u
 		logtext = "CALL_IS_DIVERTING";
 		break;
 		default:
-		SPRINT(buffer, "indicator=%d", param->notifyinfo.notify - 0x80);
+		SPRINT(buffer, "%d", param->notifyinfo.notify - 0x80);
 		logtext = buffer;
 
 	}
-	printlog("%3d  incoming NOTIFY notify='%s' id='%s'%s\n",
-		ea_endpoint->ep_serial,
-		logtext,
-		param->notifyinfo.id,
-		(param->notifyinfo.present==INFO_PRESENT_RESTRICTED)?" anonymous":""
-	);
+	trace_header("NOTIFY", DIRECTION_IN);
+	if (param->notifyinfo.notify)
+		add_trace("indicator", NULL, "%s", logtext);
+	if (param->notifyinfo.id)
+	{
+		add_trace("redir'on", "number", "%s", numberrize_callerinfo(param->notifyinfo.id, param->notifyinfo.ntype));
+		if (param->notifyinfo.present == INFO_PRESENT_RESTRICTED)
+			add_trace("redir'on", "present", "restricted");
+	}
+	if (param->notifyinfo.display[0])
+		add_trace("display", NULL, "%s", param->notifyinfo.display);
+	end_trace();
 
 	/* notify call if available */
 	if (ea_endpoint->ep_call_id)
@@ -2664,10 +2756,8 @@ void EndpointAppPBX::port_facility(struct port_list *portlist, int message_type,
 {
 	struct message *message;
 
-	printlog("%3d  incoming FACILITY len='%d'\n",
-		ea_endpoint->ep_serial,
-		param->facilityinfo.len
-		);
+	trace_header("FACILITY", DIRECTION_IN);
+	end_trace();
 
 	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_FACILITY);
 	memcpy(&message->param.facilityinfo, &param->facilityinfo, sizeof(struct facility_info));
@@ -2678,9 +2768,8 @@ void EndpointAppPBX::port_facility(struct port_list *portlist, int message_type,
 /* 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)
 {
-	printlog("%3d  incoming SUSPEND\n",
-		ea_endpoint->ep_serial
-		);
+	trace_header("SUSPEND", DIRECTION_IN);
+	end_trace();
 	/* epoint is now parked */
 	ea_endpoint->ep_park = 1;
 	memcpy(ea_endpoint->ep_park_callid, param->parkinfo.callid, sizeof(ea_endpoint->ep_park_callid));
@@ -2694,9 +2783,8 @@ void EndpointAppPBX::port_suspend(struct port_list *portlist, int message_type,
 /* NOTE: before resume, the active-notification must be done in order to set call mixer */
 void EndpointAppPBX::port_resume(struct port_list *portlist, int message_type, union parameter *param)
 {
-	printlog("%3d  incoming RESUME\n",
-		ea_endpoint->ep_serial
-		);
+	trace_header("RESUME", DIRECTION_IN);
+	end_trace();
 	/* epoint is now resumed */
 	ea_endpoint->ep_park = 0;
 
@@ -2724,7 +2812,7 @@ void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, un
 		return;
 	}
 
-//	PDEBUG(DEBUG_EPOINT, "received message %d (terminal %s, caller id %s)\n", message, e_terminal, e_callerinfo.id);
+//	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 */
@@ -2786,19 +2874,19 @@ void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, un
 
 		/* PORT sends INFORMATION message */
 		case MESSAGE_INFORMATION: /* additional digits received */
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) incoming call dialing more=%s (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, param->information.number, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) incoming call dialing more=%s (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, param->information.number, e_ext.number, e_callerinfo.id);
 		port_information(portlist, message_type, param);
 		break;
 
 		/* PORT sends FACILITY message */
 		case MESSAGE_FACILITY:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) incoming facility (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) incoming facility (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		port_facility(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_terminal, e_callerinfo.id);
+		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);
 		port_dtmf(portlist, message_type, param);
 		break;
 
@@ -2810,7 +2898,7 @@ void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, un
 
 		/* PORT sends MORE message */
 		case MESSAGE_OVERLAP:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) outgoing call is accepted [overlap dialing] (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) outgoing call is accepted [overlap dialing] (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		if (e_state != EPOINT_STATE_OUT_SETUP)
 		{
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) ignored because we are not in setup state (for port_list: another portlist might have changed the state already).\n", ea_endpoint->ep_serial);
@@ -2821,7 +2909,7 @@ void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, un
 
 		/* PORT sends PROCEEDING message */
 		case MESSAGE_PROCEEDING: /* port is proceeding */
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) outgoing call is proceeding (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) outgoing call is proceeding (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		if (e_state!=EPOINT_STATE_OUT_SETUP
 		 && e_state!=EPOINT_STATE_OUT_OVERLAP)
 		{
@@ -2833,7 +2921,7 @@ void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, un
 
 		/* PORT sends ALERTING message */
 		case MESSAGE_ALERTING:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) outgoing call is ringing (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) outgoing call is ringing (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		if (e_state!=EPOINT_STATE_OUT_SETUP
 		 && e_state!=EPOINT_STATE_OUT_OVERLAP
 		 && e_state!=EPOINT_STATE_OUT_PROCEEDING)
@@ -2846,7 +2934,7 @@ void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, un
 
 		/* PORT sends CONNECT message */
 		case MESSAGE_CONNECT:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) outgoing call connected to %s (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_connectinfo.id, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) outgoing call connected to %s (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_connectinfo.id, e_ext.number, e_callerinfo.id);
 		if (e_state!=EPOINT_STATE_OUT_SETUP
 		 && e_state!=EPOINT_STATE_OUT_OVERLAP
 		 && e_state!=EPOINT_STATE_OUT_PROCEEDING
@@ -2860,43 +2948,43 @@ void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, un
 
 		/* PORT sends DISCONNECT message */
 		case MESSAGE_DISCONNECT: /* port is disconnected */
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) call disconnect with cause=%d location=%d (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, param->disconnectinfo.cause, param->disconnectinfo.location, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) call disconnect with cause=%d location=%d (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, param->disconnectinfo.cause, param->disconnectinfo.location, e_ext.number, e_callerinfo.id);
 		port_disconnect_release(portlist, message_type, param);
 		break;
 
 		/* PORT sends a RELEASE message */
 		case MESSAGE_RELEASE: /* port releases */
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) release with cause=%d location=%d (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, param->disconnectinfo.cause, param->disconnectinfo.location, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) release with cause=%d location=%d (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, param->disconnectinfo.cause, param->disconnectinfo.location, e_ext.number, e_callerinfo.id);
 		/* portlist is release at port_disconnect_release, thanx Paul */
 		port_disconnect_release(portlist, message_type, param);
 		break;
 
 		/* PORT sends a TIMEOUT message */
 		case MESSAGE_TIMEOUT:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received timeout (state=%d).\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id, param->state);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received timeout (state=%d).\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, param->state);
 		port_timeout(portlist, message_type, param);
 		break; /* release */
 
 		/* PORT sends a NOTIFY message */
 		case MESSAGE_NOTIFY:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received notify.\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received notify.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		port_notify(portlist, message_type, param);
 		break;
 
 		/* PORT sends a SUSPEND message */
 		case MESSAGE_SUSPEND:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received suspend.\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received suspend.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		port_suspend(portlist, message_type, param);
 		break; /* suspend */
 
 		/* PORT sends a RESUME message */
 		case MESSAGE_RESUME:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received resume.\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received resume.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		port_resume(portlist, message_type, param);
 		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_terminal, e_callerinfo.id, message);
+		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);
 	}
 
 	/* Note: this endpoint may be destroyed, so we MUST return */
@@ -2930,7 +3018,7 @@ void EndpointAppPBX::call_crypt(struct port_list *portlist, int message_type, un
 		break;
 
 		default:
-		PERROR("EPOINT(%d) epoint with terminal '%s' (caller id '%s') unknown crypt message: '%d'\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id, param->crypt.type);
+		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);
 	}
 }
 
@@ -2991,7 +3079,7 @@ void EndpointAppPBX::call_overlap(struct port_list *portlist, int message_type,
 			set_tone(portlist, "dialtone");
 			return;
 	}
-	if (e_terminal[0])
+	if (e_ext.number[0])
 		set_tone(portlist, "dialpbx");
 	else
 		set_tone(portlist, "dialtone");
@@ -3054,7 +3142,7 @@ void EndpointAppPBX::call_alerting(struct port_list *portlist, int message_type,
 		set_tone(portlist, "ringing");
 		return;
 	}
-	if (e_terminal[0])
+	if (e_ext.number[0])
 		set_tone(portlist, "ringpbx");
 	else
 		set_tone(portlist, "ringing");
@@ -3067,7 +3155,7 @@ void EndpointAppPBX::call_connect(struct port_list *portlist, int message_type,
 
 	new_state(EPOINT_STATE_CONNECT);
 //			UCPY(e_call_tone, "");
-	if (e_terminal[0])
+	if (e_ext.number[0])
 		e_dtmf = 1; /* allow dtmf */
 	e_powerdialing = 0;
 	memcpy(&e_connectinfo, &param->connectinfo, sizeof(e_callerinfo));
@@ -3084,7 +3172,7 @@ void EndpointAppPBX::call_connect(struct port_list *portlist, int message_type,
 		memcpy(&message->param.connnectinfo, e_connectinfo);
 
 		/* screen clip if prefix is required */
-		if (e_terminal[0] && message->param.connectinfo.id[0] && e_ext.clip_prefix[0])
+		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));
@@ -3092,7 +3180,7 @@ void EndpointAppPBX::call_connect(struct port_list *portlist, int message_type,
 		}
 
 		/* use internal caller id */
-		if (e_terminal[0] && e_connectinfo.intern[0] && (message->param.connectinfo.present!=INFO_PRESENT_RESTRICTED || e_ext.anon_ignore))
+		if (e_ext.number[0] && e_connectinfo.intern[0] && (message->param.connectinfo.present!=INFO_PRESENT_RESTRICTED || e_ext.anon_ignore))
 		{
 			SCPY(message->param.connectinfo.id, e_connectinfo.intern);
 			message->param.connectinfo.ntype = INFO_NTYPE_UNKNOWN;
@@ -3145,7 +3233,7 @@ void EndpointAppPBX::call_disconnect_release(struct port_list *portlist, int mes
 			e_call_pattern = 0;
 		}
 		set_tone(ea_endpoint->ep_portlist, "redial");
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') redialing in %d seconds\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id, (int)e_powerdelay);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') redialing in %d seconds\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, (int)e_powerdelay);
 		/* send proceeding when powerdialing and still setup (avoid dialing timeout) */
 		if (e_state==EPOINT_STATE_IN_OVERLAP)
 		{
@@ -3315,14 +3403,14 @@ void EndpointAppPBX::call_setup(struct port_list *portlist, int message_type, un
 	}
 	/* if an internal extension is dialed, copy that number */
 	if (param->setup.dialinginfo.itype==INFO_ITYPE_INTERN || param->setup.dialinginfo.itype==INFO_ITYPE_VBOX)
-		SCPY(e_terminal, param->setup.dialinginfo.number);
+		SCPY(e_ext.number, param->setup.dialinginfo.number);
 	/* if an internal extension is dialed, get extension's info about caller */
-	if (e_terminal[0]) 
+	if (e_ext.number[0]) 
 	{
-		if (!read_extension(&e_ext, e_terminal))
+		if (!read_extension(&e_ext, e_ext.number))
 		{
-			e_terminal[0] = '\0';
-			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) the called terminal='%s' is not found in directory tree!\n", ea_endpoint->ep_serial, e_terminal);
+			e_ext.number[0] = '\0';
+			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) the called terminal='%s' is not found in directory tree!\n", ea_endpoint->ep_serial, e_ext.number);
 		}
 	}
 
@@ -3341,7 +3429,7 @@ void EndpointAppPBX::call_setup(struct port_list *portlist, int message_type, un
 	/* process (voice over) data calls */
 	if (e_ext.datacall && e_capainfo.bearer_capa!=INFO_BC_SPEECH && e_capainfo.bearer_capa!=INFO_BC_AUDIO)
 	{
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) handling data call as audio call: '%s'\n", ea_endpoint->ep_serial, e_terminal);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) handling data call as audio call: '%s'\n", ea_endpoint->ep_serial, e_ext.number);
 		memset(&e_capainfo, 0, sizeof(e_capainfo));
 		e_capainfo.bearer_capa = INFO_BC_AUDIO;
 		e_capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
@@ -3460,30 +3548,30 @@ void EndpointAppPBX::ea_message_call(unsigned long call_id, int message_type, un
 		}
 	}
 
-//	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) received message %d for active call (terminal %s, caller id %s state=%d)\n", ea_endpoint->ep_serial, message, e_terminal, e_callerinfo.id, e_state);
+//	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) received message %d for active call (terminal %s, caller id %s state=%d)\n", ea_endpoint->ep_serial, message, e_ext.number, e_callerinfo.id, e_state);
 	switch(message_type)
 	{
 		/* CALL SENDS CRYPT message */
 		case MESSAGE_CRYPT:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received crypt message: '%d'\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id, param->crypt.type);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received crypt message: '%d'\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, param->crypt.type);
 		call_crypt(portlist, message_type, param);
 		break;
 
 		/* CALL sends INFORMATION message */
 		case MESSAGE_INFORMATION:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received more digits: '%s'\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id, param->information.number);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received more digits: '%s'\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, param->information.number);
 		call_information(portlist, message_type, param);
 		break;
 
 		/* CALL sends FACILITY message */
 		case MESSAGE_FACILITY:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received facility\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received facility\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		call_facility(portlist, message_type, param);
 		break;
 
 		/* CALL 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_terminal, e_callerinfo.id);
+		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);
 		if (e_state!=EPOINT_STATE_IN_SETUP
 		 && e_state!=EPOINT_STATE_IN_OVERLAP)
 		{
@@ -3495,7 +3583,7 @@ void EndpointAppPBX::ea_message_call(unsigned long call_id, int message_type, un
 
 		/* CALL sends PROCEEDING message */
 		case MESSAGE_PROCEEDING:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s (caller id '%s') received proceeding\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s (caller id '%s') received proceeding\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		if(e_state!=EPOINT_STATE_IN_OVERLAP)
 		{
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) ignored because we are not in setup state.\n", ea_endpoint->ep_serial);
@@ -3506,7 +3594,7 @@ void EndpointAppPBX::ea_message_call(unsigned long call_id, int message_type, un
 
 		/* CALL sends ALERTING message */
 		case MESSAGE_ALERTING:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received alerting\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received alerting\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		if (e_state!=EPOINT_STATE_IN_OVERLAP
 		 && e_state!=EPOINT_STATE_IN_PROCEEDING)
 		{
@@ -3518,7 +3606,7 @@ void EndpointAppPBX::ea_message_call(unsigned long call_id, int message_type, un
 
 		/* CALL sends CONNECT message */
 		case MESSAGE_CONNECT:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received connect\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received connect\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		if (e_state!=EPOINT_STATE_IN_OVERLAP
 		 && e_state!=EPOINT_STATE_IN_PROCEEDING
 		 && e_state!=EPOINT_STATE_IN_ALERTING)
@@ -3532,7 +3620,7 @@ void EndpointAppPBX::ea_message_call(unsigned long call_id, int message_type, un
 		/* CALL sends DISCONNECT/RELEASE message */
 		case MESSAGE_DISCONNECT: /* call disconnect */
 		case MESSAGE_RELEASE: /* call releases */
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received %s with cause %d location %d\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id, (message_type==MESSAGE_DISCONNECT)?"disconnect":"release", param->disconnectinfo.cause, param->disconnectinfo.location);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received %s with cause %d location %d\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, (message_type==MESSAGE_DISCONNECT)?"disconnect":"release", param->disconnectinfo.cause, param->disconnectinfo.location);
 		call_disconnect_release(portlist, message_type, param);
 		break;
 
@@ -3545,13 +3633,13 @@ void EndpointAppPBX::ea_message_call(unsigned long call_id, int message_type, un
 
 		/* CALL sends special mISDNSIGNAL message */
 		case MESSAGE_mISDNSIGNAL: /* isdn message to port */
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received mISDNsignal message.\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received mISDNsignal message.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		call_mISDNsignal(portlist, message_type, param);
 		break;
 
 		/* CALL has pattern available */
 		case MESSAGE_PATTERN: /* indicating pattern available */
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received pattern availability.\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received pattern availability.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		if (!e_call_pattern)
 		{
 			PDEBUG(DEBUG_EPOINT, "-> pattern becomes available\n");
@@ -3576,7 +3664,7 @@ void EndpointAppPBX::ea_message_call(unsigned long call_id, int message_type, un
 
 		/* CALL has no pattern available */
 		case MESSAGE_NOPATTERN: /* indicating no pattern available */
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received pattern NOT available.\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received pattern NOT available.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		if (e_call_pattern)
 		{
 			PDEBUG(DEBUG_EPOINT, "-> pattern becomes unavailable\n");
@@ -3591,7 +3679,7 @@ void EndpointAppPBX::ea_message_call(unsigned long call_id, int message_type, un
 #if 0
 		/* CALL (dunno at the moment) */
 		case MESSAGE_REMOTE_AUDIO:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received audio remote request.\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received audio remote request.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_CHANNEL);
 		message->param.channel = param->channel;
 		message_put(message);
@@ -3600,12 +3688,12 @@ void EndpointAppPBX::ea_message_call(unsigned long call_id, int message_type, un
 
 		/* CALL sends a notify message */
 		case MESSAGE_NOTIFY:
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received notify.\n", ea_endpoint->ep_serial, e_terminal, e_callerinfo.id);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received notify.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
 		call_notify(portlist, message_type, param);
 		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_terminal, e_callerinfo.id, message);
+		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);
 	}
 }
 
@@ -3674,7 +3762,7 @@ void EndpointAppPBX::pick_call(char *extensions)
 				{
 					if (port->p_type == PORT_TYPE_VBOX_OUT)
 					{
-						if (match_list(extensions, eapp->e_terminal))
+						if (match_list(extensions, eapp->e_ext.number))
 						{
 							found = eapp;
 							vbox = 1;
@@ -3683,7 +3771,7 @@ void EndpointAppPBX::pick_call(char *extensions)
 					}
 					if ((port->p_type==PORT_TYPE_DSS1_NT_OUT || port->p_type==PORT_TYPE_DSS1_TE_OUT)
 					 && port->p_state==PORT_STATE_OUT_ALERTING)
-						if (match_list(extensions, eapp->e_terminal))
+						if (match_list(extensions, eapp->e_ext.number))
 						{
 							found = eapp;
 						}
@@ -3883,7 +3971,7 @@ void EndpointAppPBX::join_call(void)
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: we have no port.\n", ea_endpoint->ep_serial);
 		return;
 	}
-	if (!e_terminal[0])
+	if (!e_ext.number[0])
 	{
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) cannot join: we are not internal extension.\n", ea_endpoint->ep_serial);
 		return;
@@ -3910,8 +3998,8 @@ void EndpointAppPBX::join_call(void)
 			other_eapp = other_eapp->next;
 			continue;
 		}
-		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) comparing other endpoint candiate: (ep%d) terminal='%s' port=%s call=%d.\n", ea_endpoint->ep_serial, other_eapp->ea_endpoint->ep_serial, other_eapp->e_terminal, (other_eapp->ea_endpoint->ep_portlist)?"YES":"NO", other_eapp->ea_endpoint->ep_call_id);
-		if (other_eapp->e_terminal[0] /* has terminal */
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) comparing other endpoint candiate: (ep%d) terminal='%s' port=%s call=%d.\n", ea_endpoint->ep_serial, other_eapp->ea_endpoint->ep_serial, other_eapp->e_ext.number, (other_eapp->ea_endpoint->ep_portlist)?"YES":"NO", other_eapp->ea_endpoint->ep_call_id);
+		if (other_eapp->e_ext.number[0] /* has terminal */
 		 && other_eapp->ea_endpoint->ep_portlist /* has port */
 		 && other_eapp->ea_endpoint->ep_call_id) /* has call */
 		{
@@ -4049,7 +4137,7 @@ int EndpointAppPBX::check_external(char **errstr, class Port **port)
 		*errstr = "No Call";
 		return(1);
 	}
-	if (!e_terminal[0])
+	if (!e_ext.number[0])
 	{
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) error: we are not internal extension.\n", ea_endpoint->ep_serial);
 		*errstr = "No Call";
@@ -4153,99 +4241,60 @@ void EndpointAppPBX::logmessage(struct message *message)
 	switch(message->type)
 	{
 		case MESSAGE_SETUP:
-		port = find_port_id(message->id_to);
-		if (!port)
-			return;
-		if (port->p_type == PORT_TYPE_DSS1_NT_OUT)
-		{
-			pdss1 = (class Pdss1 *)port;
-			printlog("%3d  outgoing SETUP from %s='%s'%s%s%s%s to intern='%s' port='%d' (NT)\n",
-				ea_endpoint->ep_serial,
-				(message->param.setup.callerinfo.intern[0])?"intern":"extern",
-				(message->param.setup.callerinfo.intern[0])?e_callerinfo.intern:e_callerinfo.id,
-				(message->param.setup.callerinfo.present==INFO_PRESENT_RESTRICTED)?" anonymous":"",
-				(message->param.setup.redirinfo.id[0])?"redirected='":"",
-				message->param.setup.redirinfo.id,
-				(message->param.setup.redirinfo.id[0])?"'":"",
-				message->param.setup.dialinginfo.number,
-				pdss1->p_m_mISDNport->portnum
-				);
-		}
-		if (port->p_type == PORT_TYPE_DSS1_TE_OUT)
+		trace_header("SETUP", DIRECTION_OUT);
+		if (message->param.setup.callerinfo.intern[0])
+			add_trace("extension", NULL, "%s", message->param.setup.callerinfo.intern);
+		add_trace("caller id", "number", "%s", numberrize_callerinfo(message->param.setup.callerinfo.id, message->param.setup.callerinfo.ntype));
+		if (message->param.setup.callerinfo.present == INFO_PRESENT_RESTRICTED)
+			add_trace("caller id", "present", "restricted");
+		if (message->param.setup.redirinfo.number[0])
 		{
-			pdss1 = (class Pdss1 *)port;
-			printlog("%3d  outgoing SETUP from %s='%s'%s%s%s%s to extern='%s' port='%d' (TE)\n",
-				ea_endpoint->ep_serial,
-				(message->param.setup.callerinfo.intern[0])?"intern":"extern",
-				(message->param.setup.callerinfo.intern[0])?e_callerinfo.intern:e_callerinfo.id,
-				(message->param.setup.callerinfo.present==INFO_PRESENT_RESTRICTED)?" anonymous":"",
-				(message->param.setup.redirinfo.id[0])?"redirected='":"",
-				message->param.setup.redirinfo.id,
-				(message->param.setup.redirinfo.id[0])?"'":"",
-				message->param.setup.dialinginfo.number,
-				pdss1->p_m_mISDNport->portnum
-				);
-		}
-		if (port->p_type == PORT_TYPE_VBOX_OUT)
-		{
-			printlog("%3d  outgoing SETUP from %s='%s'%s%s%s%s to vbox='%s'\n",
-				ea_endpoint->ep_serial,
-				(message->param.setup.callerinfo.intern[0])?"intern":"extern",
-				(message->param.setup.callerinfo.intern[0])?e_callerinfo.intern:e_callerinfo.id,
-				(message->param.setup.callerinfo.present==INFO_PRESENT_RESTRICTED)?" anonymous":"",
-				(message->param.setup.redirinfo.id[0])?"redirected='":"",
-				message->param.setup.redirinfo.id,
-				(message->param.setup.redirinfo.id[0])?"'":"",
-				message->param.setup.dialinginfo.number
-				);
+			add_trace("redir'ing", "number", "%s", numberrize_callerinfo(message->param.setup.redirinfo.id, message->param.setup.redirinfo.ntype));
+			if (message->param.setup.redirinfo.present == INFO_PRESENT_RESTRICTED)
+				add_trace("redir'ing", "present", "restricted");
 		}
+		if (message->param.setup.dialinginfo.number[0])
+			add_trace("dialing", NULL, "%s", message->param.setup.dialinginfo.number);
+		end_trace();
 		break;
 
 		case MESSAGE_OVERLAP:
-		printlog("%3d  outgoing SETUP ACKNOWLEDGE\n",
-			ea_endpoint->ep_serial
-			);
+		trace_header("SETUP ACKNOWLEDGE", DIRECTION_OUT);
+		end_trace();
 		break;
 
 		case MESSAGE_PROCEEDING:
-		printlog("%3d  outgoing PROCEEDING\n",
-			ea_endpoint->ep_serial
-			);
+		trace_header("PROCEEDING", DIRECTION_OUT);
+		end_trace();
 		break;
 
 		case MESSAGE_ALERTING:
-		printlog("%3d  outgoing ALERTING\n",
-			ea_endpoint->ep_serial
-			);
+		trace_header("ALERTING", DIRECTION_OUT);
+		end_trace();
 		break;
 
 		case MESSAGE_CONNECT:
-		printlog("%3d  outgoing CONNECT id='%s'%s\n",
-			ea_endpoint->ep_serial,
-			message->param.connectinfo.id,
-			(message->param.connectinfo.present==INFO_PRESENT_RESTRICTED)?" anonymous":""
-		);
+		trace_header("CONNECT", DIRECTION_OUT);
+		if (message->param.connectinfo.intern[0])
+			add_trace("extension", NULL, "%s", message->param.connectinfo.intern);
+		add_trace("connect id", "number", "%s", numberrize_callerinfo(message->param.connectinfo.id, message->param.connectinfo.ntype));
+		if (message->param.connectinfo.present == INFO_PRESENT_RESTRICTED)
+			add_trace("connect id", "present", "restricted");
+		end_trace();
 		break;
 
 		case MESSAGE_DISCONNECT:
-		printlog("%3d  outgoing DISCONNECT cause='%d' (%s) location='%d' (%s) display='%s'\n",
-			ea_endpoint->ep_serial,
-			message->param.disconnectinfo.cause,
-			(message->param.disconnectinfo.cause>0 && message->param.disconnectinfo.cause<128)?isdn_cause[message->param.disconnectinfo.cause].english:"-",
-			message->param.disconnectinfo.location,
-			(message->param.disconnectinfo.location>=0 && message->param.disconnectinfo.location<16)?isdn_location[message->param.disconnectinfo.location].english:"-",
-			message->param.disconnectinfo.display
-			);
+		trace_header("DISCONNECT", DIRECTION_OUT);
+		add_trace("cause", "value", "%d", message->param.disconnectinfo.cause);
+		add_trace("cause", "location", "%d", message->param.disconnectinfo.location);
+		end_trace();
 		break;
 
 		case MESSAGE_RELEASE:
-		printlog("%3d  outgoing RELEASE cause='%d' (%s) location='%d' (%s)\n",
-			ea_endpoint->ep_serial,
-			message->param.disconnectinfo.cause,
-			(message->param.disconnectinfo.cause>0 && message->param.disconnectinfo.cause<128)?isdn_cause[message->param.disconnectinfo.cause].english:"-",
-			message->param.disconnectinfo.location,
-			(message->param.disconnectinfo.location>=0 && message->param.disconnectinfo.location<16)?isdn_location[message->param.disconnectinfo.location].english:"-"
-			);
+		trace_header("RELEASE", DIRECTION_OUT);
+		add_trace("cause", "value", "%d", message->param.disconnectinfo.cause);
+		add_trace("cause", "location", "%d", message->param.disconnectinfo.location);
+		end_trace();
 		break;
 
 		case MESSAGE_NOTIFY:
@@ -4324,39 +4373,44 @@ void EndpointAppPBX::logmessage(struct message *message)
 			logtext = "CALL_IS_DIVERTING";
 			break;
 			default:
-			SPRINT(buffer, "indicator=%d", message->param.notifyinfo.notify - 0x80);
+			SPRINT(buffer, "%d", message->param.notifyinfo.notify - 0x80);
 			logtext = buffer;
 
 		}
-		printlog("%3d  outgoing NOTIFY notify='%s' id='%s'%s display='%s'\n",
-			ea_endpoint->ep_serial,
-			logtext,
-			message->param.notifyinfo.id,
-			(message->param.notifyinfo.present==INFO_PRESENT_RESTRICTED)?" anonymous":"",
-			message->param.notifyinfo.display
-			);
+		trace_header("NOTIFY", DIRECTION_OUT);
+		if (message->param.notifyinfo.notify)
+			add_trace("indicator", NULL, "%s", logtext);
+		if (message->param.notifyinfo.number[0])
+		{
+			add_trace("redir'on", "number", "%s", numberrize_callerinfo(message->param.notifyinfo.id, message->param.notifyinfo.ntype));
+			if (message->param.notifyinfo.present == INFO_PRESENT_RESTRICTED)
+				add_trace("redir'on", "present", "restricted");
+		}
+		if (message->param.notifyinfo.display[0])
+			add_trace("display", NULL, "%s", message->param.notifyinfo.display);
+		end_trace();
 		break;
 
 		case MESSAGE_INFORMATION:
-		printlog("%3d  outgoing INFORMATION information='%s'\n",
-			ea_endpoint->ep_serial,
-			message->param.information.number
-			);
+		trace_header("INFORMATION", DIRECTION_OUT);
+		add_trace("dialing", NULL, "%s", message->param.information.number);
+		end_trace();
 		break;
 
 		case MESSAGE_FACILITY:
-		printlog("%3d  outgoing FACILITY len='%d'\n",
-			ea_endpoint->ep_serial,
-			message->param.facilityinfo.len
-			);
+		trace_header("FACILITY", DIRECTION_OUT);
+		end_trace();
 		break;
 
 		case MESSAGE_TONE:
-		printlog("%3d  outgoing TONE dir='%s' name='%s'\n",
-			ea_endpoint->ep_serial,
-			message->param.tone.dir,
-			message->param.tone.name
-			);
+		trace_header("TONE", DIRECTION_OUT);
+		if (message->param.tone.name[0])
+		{
+			add_trace("directory", NULL, "%s", message->param.tone.dir[0]?message->param.tone.dir:"default");
+			add_trace("name", NULL, "%s", message->param.tone.name);
+		} else
+			add_trace("off", NULL, NULL);
+		end_trace();
 		break;
 
 		default: