X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=remote.cpp;h=4917f3b9239b1e591e718a48cf2fe020650b2967;hp=6fcb64bb5848756fed3de04a7e6daa038048c1b9;hb=d2bcbfbaf06eafcf44d8884fd6fb0a7f334b479b;hpb=c33007184de93d4a36bc16461964753946437916

diff --git a/remote.cpp b/remote.cpp
index 6fcb64b..4917f3b 100644
--- a/remote.cpp
+++ b/remote.cpp
@@ -80,9 +80,11 @@ int Premote::message_epoint(unsigned int epoint_id, int message_type, union para
 			else
 				SCPY(param->setup.dialinginfo.context, "lcr");
 		}
-		/* screen */
+		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);
@@ -101,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;
 
@@ -136,12 +139,22 @@ void Premote::message_remote(int message_type, union parameter *param)
 
 	switch (message_type) {
 	case MESSAGE_TRAFFIC:
+		/* record audio */
+		if (p_record)
+			record(param->traffic.data, param->traffic.len, 0); // from down
+		if (p_tap)
+			tap(param->traffic.data, param->traffic.len, 0); // from down
 		bridge_tx(param->traffic.data, param->traffic.len);
 		if (p_tone_name[0]) {
 			read_audio(param->traffic.data, param->traffic.len);
+			/* record audio */
+			if (p_record)
+				record(param->traffic.data, param->traffic.len, 1); // from up
+			if (p_tap)
+				tap(param->traffic.data, param->traffic.len, 1); // from up
 			admin_message_from_lcr(p_r_remote_id, p_r_ref, MESSAGE_TRAFFIC, param);
 		}
-		break;
+		return;
 
 	case MESSAGE_SETUP:
 		interface = getinterfacebyname(p_interface_name);
@@ -172,6 +185,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;
 
@@ -184,6 +202,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;
 
@@ -230,6 +249,11 @@ int Premote::bridge_rx(unsigned char *data, int len)
 		len -= l;
 		memcpy(newparam.traffic.data, data, l);
 		data += l;
+		/* record audio */
+		if (p_record)
+			record(data, len, 1); // from up
+		if (p_tap)
+			tap(data, len, 1); // from up
 		admin_message_from_lcr(p_r_remote_id, p_r_ref, MESSAGE_TRAFFIC, &newparam);
 	}