X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=bf893886ec2bae51420e5a5aa87c71954da378d9;hp=b7a83574bcc7a174abbcdc4e7fe761fa54154dd8;hb=d9d954e58d6acf8c3de95402110e691f0bc29688;hpb=ae6976b74fbc8eb1e21efa048d734ca76168b4ba

diff --git a/apppbx.cpp b/apppbx.cpp
index b7a8357..bf89388 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -25,7 +25,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 +38,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 +50,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;
@@ -173,158 +174,6 @@ 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)
@@ -450,7 +299,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 +308,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 */
@@ -866,6 +713,8 @@ 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);
@@ -1004,13 +853,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 */
@@ -1159,7 +1001,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)
@@ -1177,14 +1019,14 @@ 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])
 			{
@@ -1296,8 +1138,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);
@@ -1371,8 +1213,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);
@@ -1649,7 +1491,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)
@@ -1727,12 +1569,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);
 		}
 
@@ -1839,14 +1681,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;
 	}
@@ -2181,7 +2029,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])
@@ -2211,12 +2059,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);
 	}
 
@@ -2591,13 +2439,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 */
@@ -2997,7 +2845,7 @@ void EndpointAppPBX::join_facility(struct port_list *portlist, int message_type,
 {
 	struct message *message;
 
-	if (!e_ext.facility)
+	if (!e_ext.facility && e_ext.number[0])
 	{
 		return;
 	}
@@ -3029,7 +2877,10 @@ void EndpointAppPBX::join_overlap(struct port_list *portlist, int message_type,
 	}
 	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])
@@ -3105,7 +2956,6 @@ void EndpointAppPBX::join_alerting(struct port_list *portlist, int message_type,
 void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type, union parameter *param)
 {
 	struct message *message;
-	struct interface	*interface;
 
 	new_state(EPOINT_STATE_CONNECT);
 //			UCPY(e_join_tone, "");
@@ -3117,19 +2967,6 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
 	{
 		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])
@@ -3147,13 +2984,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);
@@ -3286,7 +3123,7 @@ void EndpointAppPBX::join_disconnect_release(int message_type, union parameter *
 void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, union parameter *param)
 {
 	struct message *message;
-	struct interface	*interface;
+//	struct interface	*interface;
 
 	/* if we already in setup state, we just update the dialing with new digits */
 	if (e_state == EPOINT_STATE_OUT_SETUP
@@ -3383,19 +3220,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)
 	{
@@ -3443,10 +3267,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;
@@ -3475,7 +3302,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);
@@ -3887,7 +3714,7 @@ 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);
@@ -4337,10 +4164,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");