X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinremote.cpp;h=167bbce0e5df2686ff751a052e7034ea91d73648;hp=942756b9500ec4bbc739e0e547c94e29d31cd876;hb=6e1e99808e5b1c16b00904d31f95d0b74487023e;hpb=14f76f1e81f0a4e7a63e83136d1ac958bf85c8a5

diff --git a/joinremote.cpp b/joinremote.cpp
index 942756b..167bbce 100644
--- a/joinremote.cpp
+++ b/joinremote.cpp
@@ -9,26 +9,17 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-//#include <unistd.h>
-//#include <poll.h>
-//#include <sys/types.h>
-//#include <sys/stat.h>
-//#include <fcntl.h>
 #include "main.h"
 //#define __u8 unsigned char
 //#define __u16 unsigned short
-//#define __u32 unsigned long
-//#include "linux/isdnif.h"
+//#define __u32 unsigned int
 
 
 /*
  * 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;
@@ -58,32 +49,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_join(j_remote_id, j_serial, 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;
 	}
@@ -91,11 +69,10 @@ 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)
-	{
+	if (!j_epoint_id) {
 		class Endpoint		*epoint;
 
 		if (!(epoint = new Endpoint(0, j_serial)))
@@ -107,25 +84,23 @@ 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;
 	}
 	
-	/* 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);
 
-	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)
+void message_bchannel_to_remote(unsigned int remote_id, unsigned int ref, int type, unsigned int handle, int tx_gain, int rx_gain, char *pipeline, unsigned char *crypt, int crypt_len, int crypt_type)
 {
 	union parameter param;
 
@@ -139,8 +114,7 @@ void message_bchannel_to_join(unsigned long remote_id, unsigned long ref, int ty
 	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)
-	{
+	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;		
 	}