X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=e491a5731e5de115611882ea7d0c5803bafa77c2;hp=cc9effe95c5e29788b97d1e6d12ea85d7115ac70;hb=d2b113f2c4f11acfaee1b2e0fd2f03744a89f6d4;hpb=95a9a7f135a2413b5b07d16bfee93f62660a203b

diff --git a/apppbx.cpp b/apppbx.cpp
index cc9effe..e491a57 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -73,6 +73,7 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint, int origin) : EndpointApp
         e_dtmf = 0;
         e_dtmf_time = 0;
         e_dtmf_last = 0;
+	e_enablekeypad = 0;
 	e_cfnr_release = 0;
 	e_cfnr_call = 0;
 	e_password_timeout = 0;
@@ -238,6 +239,7 @@ void EndpointAppPBX::release(int release, int joinlocation, int joincause, int p
 			e_dtmf = 0;
 			e_dtmf_time = 0;
 			e_dtmf_last = 0;
+			e_enablekeypad = 0;
 			e_cfnr_release = 0;
 			e_cfnr_call = 0;
 			e_multipoint_cause = 0;
@@ -621,7 +623,7 @@ foundif:
 	if (!interface->ifport)
 	{
 		/* no ports */
-		trace_header("CHANNEL SELECTION (interface has no active ports, skipping)", DIRECTION_NONE);
+		trace_header("CHANNEL SELECTION (active ports, skipping)", DIRECTION_NONE);
 		add_trace("interface", NULL, "%s", interface->name);
 		end_trace();
 		interface = interface->next;
@@ -672,7 +674,7 @@ foundif:
 	/* see if link is up on PTP*/
 	if (mISDNport->l2hold && !mISDNport->l2link)
 	{
-		trace_header("CHANNEL SELECTION (port holds layer 2, but layer 2 is down, skipping)", DIRECTION_NONE);
+		trace_header("CHANNEL SELECTION (port's layer 2 is down, skipping)", DIRECTION_NONE);
 		add_trace("port", NULL, "%d", ifport->portnum);
 		add_trace("position", NULL, "%d", index);
 		end_trace();
@@ -809,6 +811,11 @@ foundif:
 	if (ifport != ifport_start)
 		goto nextport;
 
+	if (!ifname) {
+		interface = interface->next;
+		goto checknext;
+	}
+
 	return(NULL); /* no port found */
 }
 
@@ -1336,7 +1343,7 @@ int EndpointAppPBX::handler(void)
 			}
 			/* put on hold */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 			message_put(message);
 			/* indicate no patterns */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_NOPATTERN);
@@ -1471,7 +1478,7 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un
 	memcpy(&e_dialinginfo, &param->setup.dialinginfo, sizeof(e_dialinginfo));
 	memcpy(&e_redirinfo, &param->setup.redirinfo, sizeof(e_redirinfo));
 	memcpy(&e_capainfo, &param->setup.capainfo, sizeof(e_capainfo));
-	e_dtmf = param->setup.dtmf;
+//	e_dtmf = param->setup.dtmf;
 	/* screen incoming caller id */
 	interface = interface_first;
 	while(interface)
@@ -1661,7 +1668,7 @@ void EndpointAppPBX::port_information(struct port_list *portlist, int message_ty
 	/* keypad when connected */
 	if (e_state == EPOINT_STATE_CONNECT)
 	{
-		if (e_ext.keypad)
+		if (e_ext.keypad || e_enablekeypad)
 		{
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d) keypad information received during connect: %s.\n", ea_endpoint->ep_serial, param->information.id);
 			/* processing keypad function */
@@ -1868,7 +1875,7 @@ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type,
 
 		/* connect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	} else
 	{
@@ -1878,7 +1885,7 @@ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type,
 
 		/* disconnect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_HOLD;
+		message->param.audiopath = 0;
 		message_put(message);
 	}
 	new_state(EPOINT_STATE_OUT_OVERLAP);
@@ -1911,7 +1918,7 @@ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_typ
 
 		/* connect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	} else
 	{
@@ -1921,7 +1928,7 @@ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_typ
 
 		/* disconnect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_HOLD;
+		message->param.audiopath = 0;
 		message_put(message);
 	}
 	/* if we are in a call */
@@ -1942,6 +1949,9 @@ 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);
+//#warning hack!!
+//	if (e_adminid)
+//		set_tone(portlist, "hold");
 
 	new_state(EPOINT_STATE_OUT_ALERTING);
 	/* check if pattern is available */
@@ -1953,7 +1963,7 @@ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type,
 
 		/* connect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	} else
 	{
@@ -1963,7 +1973,7 @@ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type,
 
 		/* disconnect audio, if not already */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_HOLD;
+		message->param.audiopath = 0;
 		message_put(message);
 	}
 	/* if we are in a call */
@@ -1980,7 +1990,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 {
 	struct lcr_msg *message;
 	char buffer[256];
-	unsigned long port_id = portlist->port_id;
+	unsigned int port_id = portlist->port_id;
 	struct port_list *tportlist;
 	class Port *port;
 	struct interface	*interface;
@@ -2088,7 +2098,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 		message_put(message);
 
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	} else if (!e_adminid)
 	{
@@ -2190,7 +2200,7 @@ void EndpointAppPBX::port_disconnect_release(struct port_list *portlist, int mes
 {
 	struct lcr_msg	*message;
 	char		buffer[256];
-	unsigned long	port_id = portlist->port_id;
+	unsigned int	port_id = portlist->port_id;
 	int		cause,
 			location;
 
@@ -2288,7 +2298,7 @@ void EndpointAppPBX::port_disconnect_release(struct port_list *portlist, int mes
 			message_put(message);
 			/* connect audio, if not already */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 			message_put(message);
 			/* send disconnect */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, message_type);
@@ -2422,7 +2432,7 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u
 		if (ea_endpoint->ep_join_id)
 		{
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 			message_put(message);
 		}
 		break;
@@ -2447,7 +2457,7 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u
 		if (ea_endpoint->ep_join_id)
 		{
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 			message_put(message);
 		}
 		break;
@@ -2585,7 +2595,7 @@ void EndpointAppPBX::port_resume(struct port_list *portlist, int message_type, u
 
 /* port sends message to the endpoint
  */
-void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, union parameter *param)
+void EndpointAppPBX::ea_message_port(unsigned int port_id, int message_type, union parameter *param)
 {
 	struct port_list *portlist;
 	struct lcr_msg *message;
@@ -2865,7 +2875,7 @@ void EndpointAppPBX::join_overlap(struct port_list *portlist, int message_type,
 	{
 		/* disconnect audio */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_HOLD;
+		message->param.audiopath = 0;
 		message_put(message);
 	}
 	if (e_action) if (e_action->index == ACTION_OUTDIAL || e_action->index == ACTION_EXTERNAL)
@@ -2895,9 +2905,9 @@ void EndpointAppPBX::join_proceeding(struct port_list *portlist, int message_typ
 		/* connect / disconnect audio */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
 		if (e_ext.own_proceeding)
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 		else
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 		message_put(message);
 	}
 //			UCPY(e_join_tone, "proceeding");
@@ -2923,9 +2933,9 @@ void EndpointAppPBX::join_alerting(struct port_list *portlist, int message_type,
 		/* connect / disconnect audio */
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
 		if (e_ext.own_alerting)
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 		else
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 		message_put(message);
 	}
 	if (portlist)
@@ -2952,8 +2962,10 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
 
 	new_state(EPOINT_STATE_CONNECT);
 //			UCPY(e_join_tone, "");
+//			
 	if (e_ext.number[0])
 		e_dtmf = 1; /* allow dtmf */
+
 	e_powerdialing = 0;
 	memcpy(&e_connectinfo, &param->connectinfo, sizeof(e_callerinfo));
 	if(portlist)
@@ -2992,7 +3004,7 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
 	set_tone(portlist, NULL);
 	e_join_pattern = 0;
 	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-	message->param.audiopath = CHANNEL_STATE_CONNECT;
+	message->param.audiopath = 1;
 	message_put(message);
 	e_start = now;
 }
@@ -3098,7 +3110,7 @@ void EndpointAppPBX::join_disconnect_release(int message_type, union parameter *
 	} else /* else we enable audio */
 	{
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-		message->param.audiopath = CHANNEL_STATE_CONNECT;
+		message->param.audiopath = 1;
 		message_put(message);
 	}
 	/* send disconnect message */
@@ -3140,7 +3152,7 @@ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, un
 
 			/* disconnect audio */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 			message_put(message);
 
 			/* get dialing info */
@@ -3306,7 +3318,7 @@ void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, u
 
 /* JOIN sends messages to the endpoint
  */
-void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, union parameter *param)
+void EndpointAppPBX::ea_message_join(unsigned int join_id, int message_type, union parameter *param)
 {
 	struct port_list *portlist;
 	struct lcr_msg *message;
@@ -3463,13 +3475,8 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un
 			}
 			/* connect our audio tx and rx (blueboxing should be possibe before connect :)*/
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_CONNECT;
+			message->param.audiopath = 1;
 			message_put(message);
-//			/* tell remote epoint to connect audio also, because we like to hear the patterns */
-//			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_REMOTE_AUDIO);
-//			message->param.audiopath = CHANNEL_STATE_CONNECT;
-//			message_put(message);
-// patterns are available, remote already connected audio
 		}
 		break;
 
@@ -3482,7 +3489,7 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un
 			e_join_pattern = 0;
 			/* disconnect our audio tx and rx */
 			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-			message->param.audiopath = CHANNEL_STATE_HOLD;
+			message->param.audiopath = 0;
 			message_put(message);
 		}
 		break;
@@ -3503,6 +3510,15 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un
 		join_notify(portlist, message_type, param);
 		break;
 
+		/* JOIN wants keypad / dtml */
+		case MESSAGE_ENABLEKEYPAD:
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received keypad enable request.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		e_enablekeypad = 1;
+		e_dtmf = 1;
+		trace_header("ENABLE KEYPAD", DIRECTION_NONE);
+		end_trace();
+		break;
+
 		default:
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received a wrong message: #%d\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, message);
 	}
@@ -3682,7 +3698,8 @@ reject:
 
 	/* connnecting our endpoint */
 	new_state(EPOINT_STATE_CONNECT);
-	e_dtmf = 1;
+	if (e_ext.number[0])
+		e_dtmf = 1;
 	set_tone(ea_endpoint->ep_portlist, NULL);
 
 	/* now we send a release to the ringing endpoint */
@@ -3715,7 +3732,7 @@ reject:
 
 	/* we send a connect to the audio path (not for vbox) */
 	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
-	message->param.audiopath = CHANNEL_STATE_CONNECT;
+	message->param.audiopath = 1;
 	message_put(message);
 
 	/* beeing paranoid, we make call update */
@@ -4035,7 +4052,7 @@ int EndpointAppPBX::check_external(char **errstr, class Port **port)
 	return(0);
 }
 
-void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsigned long port_id, int dir)
+void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsigned int port_id, int dir)
 {
 	char *logtext = "unknown";
 	char buffer[64];