X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=remote.cpp;h=540a16fa8d10e42eeca676d3ab79d336bf7467f6;hp=d181fb835af2d57cba70cc1c8dfbc43684fe6ff0;hb=b971fdeb6243a5ea64a75cce40cb698946b75411;hpb=7f0d14c706328e1ff74fe8b8c16ae54407cc8055

diff --git a/remote.cpp b/remote.cpp
index d181fb8..540a16f 100644
--- a/remote.cpp
+++ b/remote.cpp
@@ -80,6 +80,16 @@ int Premote::message_epoint(unsigned int epoint_id, int message_type, union para
 			else
 				SCPY(param->setup.dialinginfo.context, "lcr");
 		}
+		memcpy(&p_dialinginfo, &param->setup.dialinginfo, sizeof(p_dialinginfo));
+		memcpy(&p_capainfo, &param->setup.capainfo, sizeof(p_capainfo));
+		memcpy(&p_callerinfo, &param->setup.callerinfo, sizeof(p_callerinfo));
+		memcpy(&p_redirinfo, &param->setup.redirinfo, sizeof(p_redirinfo));
+		/* screen */
+		do_screen(1, p_callerinfo.id, sizeof(p_callerinfo.id), &p_callerinfo.ntype, &p_callerinfo.present, p_interface_name);
+		do_screen(1, p_callerinfo.id2, sizeof(p_callerinfo.id2), &p_callerinfo.ntype2, &p_callerinfo.present2, p_interface_name);
+		do_screen(1, p_redirinfo.id, sizeof(p_redirinfo.id), &p_redirinfo.ntype, &p_redirinfo.present, p_interface_name);
+		memcpy(&param->setup.callerinfo, &p_callerinfo, sizeof(p_callerinfo));
+		memcpy(&param->setup.redirinfo, &p_redirinfo, sizeof(p_redirinfo));
 
 		new_state(PORT_STATE_OUT_SETUP);
 		break;
@@ -93,6 +103,7 @@ int Premote::message_epoint(unsigned int epoint_id, int message_type, union para
 		break;
 
 	case MESSAGE_CONNECT:
+		memcpy(&p_connectinfo, &param->connectinfo, sizeof(p_connectinfo));
 		new_state(PORT_STATE_CONNECT);
 		break;
 
@@ -129,6 +140,10 @@ void Premote::message_remote(int message_type, union parameter *param)
 	switch (message_type) {
 	case MESSAGE_TRAFFIC:
 		bridge_tx(param->traffic.data, param->traffic.len);
+		if (p_tone_name[0]) {
+			read_audio(param->traffic.data, param->traffic.len);
+			admin_message_from_lcr(p_r_remote_id, p_r_ref, MESSAGE_TRAFFIC, param);
+		}
 		break;
 
 	case MESSAGE_SETUP:
@@ -160,6 +175,11 @@ void Premote::message_remote(int message_type, union parameter *param)
 
 		epointlist_new(epoint->ep_serial);
 
+		memcpy(&p_dialinginfo, &param->setup.dialinginfo, sizeof(p_dialinginfo));
+		memcpy(&p_capainfo, &param->setup.capainfo, sizeof(p_capainfo));
+		memcpy(&p_callerinfo, &param->setup.callerinfo, sizeof(p_callerinfo));
+		memcpy(&p_redirinfo, &param->setup.redirinfo, sizeof(p_redirinfo));
+
 		new_state(PORT_STATE_IN_SETUP);
 		break;
 
@@ -172,6 +192,7 @@ void Premote::message_remote(int message_type, union parameter *param)
 		break;
 
 	case MESSAGE_CONNECT:
+		memcpy(&p_connectinfo, &param->connectinfo, sizeof(p_connectinfo));
 		new_state(PORT_STATE_CONNECT);
 		break;
 
@@ -207,6 +228,9 @@ int Premote::bridge_rx(unsigned char *data, int len)
 	 && p_state != PORT_STATE_CONNECT)
 	 	return 0;
 
+	if (p_tone_name[0])
+		return 0;
+
 	memset(&newparam, 0, sizeof(union parameter));
 	/* split, if exeeds data size */
 	while(len) {