X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinremote.cpp;h=c02de8e4a70c406505ee281647c0f40d4f49f346;hp=20c94dc8b32597ac1c50822abcf69a38be488f5e;hb=9f505bd729375423e885dcbe4db30df65541f7a7;hpb=0efcf371b4a61fa1376e83d2b7404aeb47a36e26

diff --git a/joinremote.cpp b/joinremote.cpp
index 20c94dc..c02de8e 100644
--- a/joinremote.cpp
+++ b/joinremote.cpp
@@ -12,14 +12,15 @@
 #include "main.h"
 //#define __u8 unsigned char
 //#define __u16 unsigned short
-//#define __u32 unsigned long
+//#define __u32 unsigned int
 
+extern unsigned int new_remote;
 
 /*
  * constructor for a new join 
  * the join will have a relation to the calling endpoint
  */
-JoinRemote::JoinRemote(unsigned long serial, char *remote_name, int remote_id) : Join()
+JoinRemote::JoinRemote(unsigned int serial, char *remote_name, int remote_id) : Join()
 {
 	PDEBUG(DEBUG_JOIN, "Constructor(new join)");
 	union parameter param;
@@ -27,6 +28,7 @@ JoinRemote::JoinRemote(unsigned long serial, char *remote_name, int remote_id) :
 	SCPY(j_remote_name, remote_name);
 	j_remote_id = remote_id;
 	j_type = JOIN_TYPE_REMOTE;
+	j_remote_ref = new_remote++;
 
 	j_epoint_id = serial; /* this is the endpoint, if created by epoint */
 	if (j_epoint_id)
@@ -35,9 +37,8 @@ JoinRemote::JoinRemote(unsigned long serial, char *remote_name, int remote_id) :
 	/* send new ref to remote socket */
 	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)
+		param.newref.direction = 1; /* new ref from lcr */
+	if (admin_message_from_lcr(j_remote_id, j_remote_ref, 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);
 }
 
@@ -49,32 +50,19 @@ JoinRemote::~JoinRemote()
 {
 }
 
-
-/* join process is called from the main loop
- * it processes the current calling state.
- * returns 0 if join nothing was done
- */
-int JoinRemote::handler(void)
-{
-	return(0);
-}
-
-
-void JoinRemote::message_epoint(unsigned long epoint_id, int message_type, union parameter *param)
+void JoinRemote::message_epoint(unsigned int epoint_id, int message_type, union parameter *param)
 {
 	/* if endpoint has just been removed, but still a message in the que */
 	if (epoint_id != j_epoint_id)
 		return;
 	
 	/* look for Remote's interface */
-	if (admin_message_from_join(j_remote_id, j_serial, message_type, param)<0)
-	{
+	if (admin_message_from_lcr(j_remote_id, j_remote_ref, message_type, param)<0) {
 		PERROR("No socket with remote application '%s' found, this shall not happen. Closing socket shall cause release of all joins.\n", j_remote_name);
 		return;		
 	}
 
-	if (message_type == MESSAGE_RELEASE)
-	{
+	if (message_type == MESSAGE_RELEASE) {
 		delete this;
 		return;
 	}
@@ -85,8 +73,7 @@ void JoinRemote::message_remote(int message_type, union parameter *param)
 	struct lcr_msg *message;
 
 	/* create relation if no relation exists */
-	if (!j_epoint_id)
-	{
+	if (!j_epoint_id) {
 		class Endpoint		*epoint;
 
 		if (!(epoint = new Endpoint(0, j_serial)))
@@ -98,9 +85,8 @@ void JoinRemote::message_remote(int message_type, union parameter *param)
 
 	/* set serial on bchannel message
 	 * 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.handle);
+	if (message_type == MESSAGE_BCHANNEL) {
+		message_bchannel_from_remote(this, param->bchannel.type, param->bchannel.handle);
 		return;
 	}
 	
@@ -109,33 +95,11 @@ void JoinRemote::message_remote(int message_type, union parameter *param)
 	memcpy(&message->param, param, sizeof(message->param));
 	message_put(message);
 
-	if (message_type == MESSAGE_RELEASE)
-	{
+	if (message_type == MESSAGE_RELEASE) {
 		delete this;
 		return;
 	}
 }
 
-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;
-
-	memset(&param, 0, sizeof(union parameter));
-	param.bchannel.type = type;
-	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 id %d found, this happens, if the socket is closed before all bchannels are imported.\n", remote_id);
-		return;		
-	}
-}
-