X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinremote.cpp;h=ec65f350addc1ce1670cec73633bef29e03dfe51;hp=f2c08b779cf8650167e4bcd37a288f7b6f353240;hb=27b95197734350cc99c29929c2527f2c6d5541d6;hpb=cbe9d412a37e75b61cc74e8a65b0293923eb5160

diff --git a/joinremote.cpp b/joinremote.cpp
index f2c08b7..ec65f35 100644
--- a/joinremote.cpp
+++ b/joinremote.cpp
@@ -31,7 +31,7 @@
 JoinRemote::JoinRemote(unsigned long serial, char *remote_name, int remote_id) : Join()
 {
 	PDEBUG(DEBUG_JOIN, "Constructor(new join)");
-	union parameter *param;
+	union parameter param;
 
 	SCPY(j_remote_name, remote_name);
 	j_remote_id = remote_id;
@@ -42,9 +42,11 @@ JoinRemote::JoinRemote(unsigned long serial, char *remote_name, int remote_id) :
 		PDEBUG(DEBUG_JOIN, "New remote join connected to endpoint id %lu and application %s\n", j_epoint_id, remote_name);
 
 	/* send new ref to remote socket */
-	memset(&param, 0, sizeof(param));
+	memset(&param, 0, sizeof(union parameter));
+	if (serial)
+		param.direction = 1; /* new ref from lcr */
 	/* the j_serial is assigned by Join() parent. this is sent as new ref */
-	if (admin_message_from_join(j_remote_id, j_serial, MESSAGE_NEWREF, param)<0)
+	if (admin_message_from_join(j_remote_id, j_serial, MESSAGE_NEWREF, &param)<0)
 		FATAL("No socket with remote application '%s' found, this shall not happen. because we already created one.\n", j_remote_name);
 }
 
@@ -89,7 +91,7 @@ void JoinRemote::message_epoint(unsigned long epoint_id, int message_type, union
 
 void JoinRemote::message_remote(int message_type, union parameter *param)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	/* create relation if no relation exists */
 	if (!j_epoint_id)
@@ -99,7 +101,7 @@ void JoinRemote::message_remote(int message_type, union parameter *param)
 		if (!(epoint = new Endpoint(0, j_serial)))
 			FATAL("No memory for Endpoint instance\n");
 		j_epoint_id = epoint->ep_serial;
-		if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint)))
+		if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint, 1))) // outgoing
 			FATAL("No memory for Endpoint Application instance\n");
 	}
 
@@ -107,11 +109,11 @@ void JoinRemote::message_remote(int message_type, union parameter *param)
 	 * also ref is given, so we send message with ref */
 	if (message_type == MESSAGE_BCHANNEL)
 	{
-		message_bchannel_from_join(this, param->bchannel.type, param->bchannel.addr);
+		message_bchannel_from_join(this, param->bchannel.type, param->bchannel.handle);
 		return;
 	}
 	
-	/* cannot just forward, because param is not of container "struct message" */
+	/* cannot just forward, because param is not of container "struct lcr_msg" */
 	message = message_create(j_serial, j_epoint_id, JOIN_TO_EPOINT, message_type);
 	memcpy(&message->param, param, sizeof(message->param));
 	message_put(message);
@@ -123,32 +125,23 @@ void JoinRemote::message_remote(int message_type, union parameter *param)
 	}
 }
 
-void message_bchannel_to_join(int serial, int type, unsigned long addr)
+void message_bchannel_to_join(unsigned long remote_id, unsigned long ref, int type, unsigned long handle, int tx_gain, int rx_gain, char *pipeline, unsigned char *crypt, int crypt_len, int crypt_type)
 {
 	union parameter param;
-	class Join *join;
-	class JoinRemote *joinremote;
-
-	/* find join serial */
-	join = find_join_id(serial);
-	if (!join)
-	{
-		PDEBUG(DEBUG_JOIN | DEBUG_BCHANNEL, "Join %d not found\n", serial);
-		return;
-	}
-	if (!join->j_type != JOIN_TYPE_REMOTE)
-	{
-		PERROR("Join %d not of remote type. This shall not happen.\n", serial);
-		return;
-	}
-	joinremote = (class JoinRemote *)join;
 
 	memset(&param, 0, sizeof(union parameter));
 	param.bchannel.type = type;
-	param.bchannel.addr = addr;
-	if (admin_message_from_join(joinremote->j_remote_id, joinremote->j_serial, MESSAGE_BCHANNEL, &param)<0)
+	param.bchannel.handle = handle;
+	param.bchannel.tx_gain = tx_gain;
+	param.bchannel.rx_gain = rx_gain;
+	if (pipeline)
+		SCPY(param.bchannel.pipeline, pipeline);
+	if (crypt_len)
+		memcpy(param.bchannel.crypt, crypt, crypt_len);
+	param.bchannel.crypt_type = crypt_type;
+	if (admin_message_from_join(remote_id, ref, MESSAGE_BCHANNEL, &param)<0)
 	{
-		PERROR("No socket with remote application '%s' found, this shall not happen. Closing socket shall cause release of all joins.\n", joinremote->j_remote_name);
+		PERROR("No socket with remote id %d found, this happens, if the socket is closed before all bchannels are imported.\n", remote_id);
 		return;		
 	}
 }