X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=9752b8714477c22b6bdd14a288cb0ae7526ea861;hp=8df43f6738e6dbf6ba39e3831a06e1f060bbea20;hb=5566f74eb29be75da44e29ba72ee6f015249ce61;hpb=acaf278f7f616d264afe480e4f9c64768540941b

diff --git a/apppbx.cpp b/apppbx.cpp
index 8df43f6..9752b87 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -525,6 +525,18 @@ void EndpointAppPBX::keypad_function(char digit)
 			join_join_dss1();
 		break;
 
+		/* VOOTP on */
+		case '1':
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) enable VoOTP.\n", ea_endpoint->ep_serial);
+		vootp_on(1);
+		break;
+
+		/* VOOTP off */
+		case '2':
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) disable VoOTP.\n", ea_endpoint->ep_serial);
+		vootp_on(0);
+		break;
+
 #ifdef WITH_CRYPT
 		/* crypt shared */
 		case '7':
@@ -544,7 +556,6 @@ void EndpointAppPBX::keypad_function(char digit)
 		encrypt_off();
 		break;
 #endif
-
 		default:	
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) unsupported keypad digit '%c'.\n", ea_endpoint->ep_serial, digit);
 	}
@@ -1389,8 +1400,8 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un
 	/* screen incoming caller id */
 	if (e_callerinfo.interface[0]) {
 		do_screen(0, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, e_callerinfo.interface);
-		do_screen(0, e_callerinfo.id2, sizeof(e_callerinfo.id2), &e_callerinfo.ntype2, &e_callerinfo.present2, e_callerinfo.interface);
-		do_screen(0, e_redirinfo.id, sizeof(e_redirinfo.id), &e_redirinfo.ntype, &e_redirinfo.present, e_callerinfo.interface);
+		if (e_callerinfo.id2[0]) do_screen(0, e_callerinfo.id2, sizeof(e_callerinfo.id2), &e_callerinfo.ntype2, &e_callerinfo.present2, e_callerinfo.interface);
+		if (e_redirinfo.id[0]) do_screen(0, e_redirinfo.id, sizeof(e_redirinfo.id), &e_redirinfo.ntype, &e_redirinfo.present, e_callerinfo.interface);
 	}
 
 	/* process extension */
@@ -1959,6 +1970,16 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type,
 		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH);
 		message->param.audiopath = 1;
 		message_put(message);
+		if (e_ext.dov_ident[0]) {
+			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_DOV_REQUEST);
+			SPRINT(message->param.dov.data, "%08x ", lcr_random);
+			SCAT(message->param.dov.data, e_ext.dov_ident);
+			message->param.dov.length = strlen((char *)message->param.dov.data);
+			message->param.dov.type = e_ext.dov_type;
+			message->param.dov.level = e_ext.dov_level;
+			dov_msg_write(&message->param, 1);
+			message_put(message);
+		}
 	} else if (!e_adminid) {
 		/* 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);
@@ -2429,6 +2450,36 @@ void EndpointAppPBX::port_disable_dejitter(struct port_list *portlist, int messa
 	message_put(message);
 }
 
+/* port MESSAGE_DOV_INDICATION */
+void EndpointAppPBX::port_dov_indication(struct port_list *portlist, int message_type, union parameter *param)
+{
+	struct lcr_msg *message;
+
+	logmessage(message_type, param, portlist->port_id, DIRECTION_IN);
+
+	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_DOV_INDICATION);
+	memcpy(&message->param, param, sizeof(union parameter));
+	message_put(message);
+}
+
+
+/* port MESSAGE_UPDATEBRIDGE  */
+void EndpointAppPBX::port_updatebridge(struct port_list *portlist, int message_type, union parameter *param)
+{
+	struct lcr_msg *message;
+
+	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_UPDATEBRIDGE);
+	message_put(message);
+}
+
+
+/* port MESSAGE_VOOTP  */
+void EndpointAppPBX::port_vootp(struct port_list *portlist, int message_type, union parameter *param)
+{
+	if (param->vootp.failed)
+		set_tone(ea_endpoint->ep_portlist, "crypt_off");
+}
+
 
 /* port sends message to the endpoint
  */
@@ -2626,6 +2677,21 @@ void EndpointAppPBX::ea_message_port(unsigned int port_id, int message_type, uni
 		port_disable_dejitter(portlist, message_type, param);
 		break;
 
+		case MESSAGE_UPDATEBRIDGE:
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) incoming updatebridge message (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		port_updatebridge(portlist, message_type, param);
+		break;
+
+		case MESSAGE_VOOTP:
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) incoming vootp message (terminal '%s', caller id '%s')\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		port_vootp(portlist, message_type, param);
+		break;
+
+		/* PORT indivated Data-Over-Voice */
+		case MESSAGE_DOV_INDICATION:
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') indicates Data-Over-Voice.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		port_dov_indication(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_ext.number, e_callerinfo.id, message_type);
@@ -2845,6 +2911,13 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
 	message_put(message);
 	time(&now);
 	e_start = now;
+
+	/* if the remote answered, we listen to DOV message */
+	if (e_ext.dov_log[0]) {
+		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_DOV_LISTEN);
+		message->param.dov.type = e_ext.dov_type;
+		message_put(message);
+	}
 }
 
 /* join MESSAGE_DISCONNECT MESSAGE_RELEASE */
@@ -3163,6 +3236,43 @@ void EndpointAppPBX::join_disable_dejitter(struct port_list *portlist, int messa
 	}
 }
 
+/* join MESSAGE_DOV_INDICATION */
+void EndpointAppPBX::join_dov_indication(struct port_list *portlist, int message_type, union parameter *param)
+{
+	dov_msg_write(param, 0);
+}
+
+/* join MESSAGE_DOV_REQUEST */
+void EndpointAppPBX::join_dov_request(struct port_list *portlist, int message_type, union parameter *param)
+{
+	struct lcr_msg *message;
+
+	/* don't send DOV from estension to extension */
+	if (e_ext.number[0])
+		return;
+
+	while(portlist) {
+		message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_DOV_REQUEST);
+		memcpy(&message->param, param, sizeof(union parameter));
+		message_put(message);
+		logmessage(message_type, param, portlist->port_id, DIRECTION_OUT);
+		portlist = portlist->next;
+	}
+}
+
+/* join MESSAGE_DOV_LISTEN */
+void EndpointAppPBX::join_dov_listen(struct port_list *portlist, int message_type, union parameter *param)
+{
+	struct lcr_msg *message;
+
+	while(portlist) {
+		message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_DOV_LISTEN);
+		memcpy(&message->param, param, sizeof(union parameter));
+		message_put(message);
+		portlist = portlist->next;
+	}
+}
+
 /* JOIN sends messages to the endpoint
  */
 void EndpointAppPBX::ea_message_join(unsigned int join_id, int message_type, union parameter *param)
@@ -3340,6 +3450,24 @@ void EndpointAppPBX::ea_message_join(unsigned int join_id, int message_type, uni
 		join_disable_dejitter(portlist, message_type, param);
 		break;
 
+		/* JOIN sends a Data-Over-Voice message indication */
+		case MESSAGE_DOV_INDICATION:
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received Data-Over-Voice indication.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		join_dov_indication(portlist, message_type, param);
+		break;
+
+		/* JOIN sends a Data-Over-Voice message request */
+		case MESSAGE_DOV_REQUEST:
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received Data-Over-Voice request.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		join_dov_request(portlist, message_type, param);
+		break;
+
+		/* JOIN sends a Data-Over-Voice listen order */
+		case MESSAGE_DOV_LISTEN:
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received Data-Over-Voice listen order.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id);
+		join_dov_listen(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_ext.number, e_callerinfo.id, message_type);
 	}
@@ -3391,10 +3519,8 @@ void EndpointAppPBX::pick_join(char *extensions)
 	class Join *join;
 	class JoinPBX *joinpbx;
 	struct join_relation *relation;
-	int vbox;
 
 	/* find an endpoint that is ringing internally or vbox with higher priority */
-	vbox = 0;
 	found = NULL;
 	eapp = apppbx_first;
 	while(eapp) {
@@ -3405,7 +3531,6 @@ void EndpointAppPBX::pick_join(char *extensions)
 					if (port->p_type == PORT_TYPE_VBOX_OUT) {
 						if (match_list(extensions, eapp->e_ext.number)) {
 							found = eapp;
-							vbox = 1;
 							break;
 						}
 					}
@@ -4305,6 +4430,30 @@ int EndpointAppPBX::check_external(const char **errstr, class Port **port)
 	return(0);
 }
 
+int EndpointAppPBX::vootp_on(int on)
+{
+#ifndef WITH_VOOTP
+	set_tone(ea_endpoint->ep_portlist, "crypt_off");
+#else
+	if (!e_ext.otp_ident[0]) {
+		set_tone(ea_endpoint->ep_portlist, "crypt_off");
+		return -EINVAL;
+	}
+	if(ea_endpoint->ep_portlist) {
+		struct lcr_msg *message;
+
+		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_portlist->port_id, EPOINT_TO_PORT, MESSAGE_VOOTP);
+		message->param.vootp.enable = on;
+		SCPY(message->param.vootp.id, e_ext.otp_ident);
+		message_put(message);
+	}
+	if (!on)
+		set_tone(ea_endpoint->ep_portlist, "crypt_off");
+#endif
+
+	return 0;
+}
+
 void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsigned int port_id, int dir)
 {
 	const char *logtext = "unknown";
@@ -4735,6 +4884,23 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign
 		end_trace();
 		break;
 
+		case MESSAGE_DOV_INDICATION:
+		case MESSAGE_DOV_REQUEST:
+		trace_header("Data-Over-Voice", dir);
+		if (dir == DIRECTION_OUT)
+			add_trace("to", NULL, "CH(%lu)", port_id);
+		if (dir == DIRECTION_IN)
+			add_trace("from", NULL, "CH(%lu)", port_id);
+		{
+			char dov_str[param->dov.length + 1];
+			memcpy(dov_str, param->dov.data, param->dov.length);
+			dov_str[param->dov.length] = '\0';
+			add_trace("string", NULL, "%s", dov_str);
+		}
+		add_trace("type", NULL, "%d", param->dov.type);
+		end_trace();
+		break;
+
 		default:
 		PERROR("EPOINT(%d) message not of correct type (%d)\n", ea_endpoint->ep_serial, message_type);
 	}
@@ -4768,3 +4934,38 @@ void EndpointAppPBX::message_disconnect_port(struct port_list *portlist, int cau
 	logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT);
 }
 
+void EndpointAppPBX::dov_msg_write(union parameter *param, int sent)
+{
+	FILE *fp;
+	struct tm *tm;
+	time_t ti;
+	int __attribute__((__unused__)) rc;
+
+	/* no write, if no log file given */
+	if (!e_ext.dov_log[0])
+		return;
+
+	fp = fopen(e_ext.dov_log, "a");
+	if (!fp) {
+		PERROR("EPOINT(%d) failed to open Data-Over-Voice log file '%s'\n", ea_endpoint->ep_serial, e_ext.dov_log);
+		return;
+	}
+
+	ti = time(NULL);
+	tm = localtime(&ti);
+	fprintf(fp, "%02d.%02d.%02d %02d:%02d:%02d ", tm->tm_mday, tm->tm_mon+1, tm->tm_year%100, tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+
+	if (sent) {
+		fprintf(fp, "sent [%s] ", numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype, options.national, options.international));
+	} else {
+		fprintf(fp, "received [%s] ", e_dialinginfo.id);
+	}
+
+	rc = fwrite(param->dov.data, param->dov.length, 1, fp);
+
+	fprintf(fp, "\n");
+
+	fclose(fp);
+}
+