** **
\*****************************************************************************/
-#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
+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;
SCPY(j_remote_name, remote_name);
j_remote_id = remote_id;
j_type = JOIN_TYPE_REMOTE;
+ j_remote_ref = new_remote++;
+
+ PDEBUG(DEBUG_JOIN, "Constructor(new join) ref=%d\n", j_remote_ref);
j_epoint_id = serial; /* this is the endpoint, if created by epoint */
if (j_epoint_id)
- PDEBUG(DEBUG_JOIN, "New remote join connected to endpoint id %lu and application %s\n", j_epoint_id, remote_name);
+ PDEBUG(DEBUG_JOIN, "New remote join connected to endpoint id %lu and application %s (ref=%d)\n", j_epoint_id, remote_name, j_remote_ref);
/* send new ref to remote socket */
memset(¶m, 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, ¶m)<0)
+ param.newref.direction = 1; /* new ref from lcr */
+ if (admin_message_from_lcr(j_remote_id, j_remote_ref, MESSAGE_NEWREF, ¶m)<0)
FATAL("No socket with remote application '%s' found, this shall not happen. because we already created one.\n", j_remote_name);
}
{
}
-
-/* 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;
+ PDEBUG(DEBUG_JOIN, "Message %d of endpoint %d from LCR to remote (ref=%d)\n", message_type, j_epoint_id, j_remote_ref);
+
/* 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;
}
void JoinRemote::message_remote(int message_type, union parameter *param)
{
- struct message *message;
+ struct lcr_msg *message;
+
+ PDEBUG(DEBUG_JOIN, "Message %d of endpoint %d from remote to LCR (ref=%d)\n", message_type, j_epoint_id, j_remote_ref);
/* create relation if no relation exists */
- if (!j_epoint_id)
- {
+ if (!j_epoint_id) {
class Endpoint *epoint;
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)))
+ PDEBUG(DEBUG_JOIN, "Created endpoint %d\n", j_epoint_id);
+ if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint, 1))) // outgoing
FATAL("No memory for Endpoint Application instance\n");
}
/* 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.addr);
+ 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 addr)
-{
- union parameter param;
-
- memset(¶m, 0, sizeof(union parameter));
- param.bchannel.type = type;
- param.bchannel.addr = addr;
- if (admin_message_from_join(remote_id, ref, MESSAGE_BCHANNEL, ¶m)<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;
- }
-}
-
projects / lcr.git / blobdiff