X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.cpp;h=630c59941332149e2d3364ccd8b0272076807ff4;hp=750705fd266a726623e37ec62a54952ffa8c36ca;hb=b2a665f8f1cdeb7d02c3f665d95e6a80297e21d1;hpb=541572c18c3c4476da5dbec48b313e613562b438 diff --git a/joinpbx.cpp b/joinpbx.cpp index 750705f..630c599 100644 --- a/joinpbx.cpp +++ b/joinpbx.cpp @@ -9,26 +9,17 @@ ** ** \*****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include #include "main.h" -#define __u8 unsigned char -#define __u16 unsigned short -#define __u32 unsigned long -#include "linux/isdnif.h" +//#define __u8 unsigned char +//#define __u16 unsigned short +//#define __u32 unsigned int /* notify endpoint about state change (if any) */ static int notify_state_change(int join_id, int epoint_id, int old_state, int new_state) { int notify_off = 0, notify_on = 0; - struct message *message; + struct lcr_msg *message; if (old_state == new_state) return(old_state); @@ -121,7 +112,7 @@ static int notify_state_change(int join_id, int epoint_id, int old_state, int ne /* debug function for join */ -void joinpbx_debug(class JoinPBX *joinpbx, char *function) +void joinpbx_debug(class JoinPBX *joinpbx, const char *function) { struct join_relation *relation; struct port_list *portlist; @@ -143,12 +134,12 @@ void joinpbx_debug(class JoinPBX *joinpbx, char *function) epoint = find_epoint_id(relation->epoint_id); if (!epoint) { - PDEBUG(DEBUG_JOIN, "warning: relations epoint id=%ld doesn't exists!\n", relation->epoint_id); + PDEBUG(DEBUG_JOIN, "warning: relations epoint id=%d doesn't exists!\n", relation->epoint_id); relation = relation->next; continue; } buffer[0] = '\0'; - UPRINT(strchr(buffer,0), "*** ep%ld", relation->epoint_id); + UPRINT(strchr(buffer,0), "*** ep%d", relation->epoint_id); UPRINT(strchr(buffer,0), " ifs="); portlist = epoint->ep_portlist; while(portlist) @@ -157,7 +148,7 @@ void joinpbx_debug(class JoinPBX *joinpbx, char *function) if (port) UPRINT(strchr(buffer,0), "%s,", port->p_name); else - UPRINT(strchr(buffer,0), ",", portlist->port_id); + UPRINT(strchr(buffer,0), ",", portlist->port_id); portlist = portlist->next; } // UPRINT(strchr(buffer,0), " endpoint=%d on=%s hold=%s", epoint->ep_serial, (epoint->ep_join_id==joinpbx->j_serial)?"yes":"no", (epoint->get_hold_id()==joinpbx->j_serial)?"yes":"no"); @@ -177,18 +168,10 @@ void joinpbx_debug(class JoinPBX *joinpbx, char *function) UPRINT(strchr(buffer,0), " type=unknown"); break; } - switch(relation->channel_state) - { - case CHANNEL_STATE_CONNECT: + if (relation->channel_state) UPRINT(strchr(buffer,0), " channel=CONNECT"); - break; - case CHANNEL_STATE_HOLD: + else UPRINT(strchr(buffer,0), " channel=HOLD"); - break; - default: - UPRINT(strchr(buffer,0), " channel=unknown"); - break; - } switch(relation->tx_state) { case NOTIFY_STATE_ACTIVE: @@ -263,7 +246,7 @@ JoinPBX::JoinPBX(class Endpoint *epoint) : Join() relation = j_relation = (struct join_relation *)MALLOC(sizeof(struct join_relation)); cmemuse++; relation->type = RELATION_TYPE_CALLING; - relation->channel_state = CHANNEL_STATE_HOLD; /* audio is assumed on a new join */ + relation->channel_state = 0; /* audio is assumed on a new join */ relation->tx_state = NOTIFY_STATE_ACTIVE; /* new joins always assumed to be active */ relation->rx_state = NOTIFY_STATE_ACTIVE; /* new joins always assumed to be active */ relation->epoint_id = epoint->ep_serial; @@ -298,7 +281,7 @@ JoinPBX::~JoinPBX() void JoinPBX::bridge(void) { struct join_relation *relation; - struct message *message; + struct lcr_msg *message; int numconnect = 0, relations = 0; class Endpoint *epoint; struct port_list *portlist; @@ -328,7 +311,7 @@ void JoinPBX::bridge(void) { PDEBUG(DEBUG_JOIN, "join%d ignoring relation without port object.\n", j_serial); //#warning testing: keep on hold until single audio stream available - relation->channel_state = CHANNEL_STATE_HOLD; + relation->channel_state = 0; relation = relation->next; continue; } @@ -336,7 +319,7 @@ void JoinPBX::bridge(void) { PDEBUG(DEBUG_JOIN, "join%d ignoring relation with ep%d due to port_list.\n", j_serial, epoint->ep_serial); //#warning testing: keep on hold until single audio stream available - relation->channel_state = CHANNEL_STATE_HOLD; + relation->channel_state = 0; relation = relation->next; continue; } @@ -368,13 +351,13 @@ void JoinPBX::bridge(void) while(relation) { /* count connected relations */ - if ((relation->channel_state == CHANNEL_STATE_CONNECT) + if ((relation->channel_state == 1) && (relation->rx_state != NOTIFY_STATE_SUSPEND) && (relation->rx_state != NOTIFY_STATE_HOLD)) numconnect ++; /* remove unconnected parties from conference, also remove remotely disconnected parties so conference will not be disturbed. */ - if (relation->channel_state == CHANNEL_STATE_CONNECT + if (relation->channel_state == 1 && relation->rx_state != NOTIFY_STATE_HOLD && relation->rx_state != NOTIFY_STATE_SUSPEND && relations>1 // no conf with one member @@ -418,13 +401,13 @@ void JoinPBX::bridge(void) relation->next->tx_state = notify_state_change(j_serial, relation->next->epoint_id, relation->next->tx_state, relation->rx_state); } else /* one member in a join, so we put her on hold */ - if ((relations==1 || numconnect==1) && !j_partyline_jingle) + if ((relations==1 || numconnect==1)/* && !j_partyline_jingle*/) { - PDEBUG(DEBUG_JOIN, "join%d 1 member or only 1 connected, put on hold\n"); + PDEBUG(DEBUG_JOIN, "join%d 1 member or only 1 connected, put on hold\n", j_serial); relation = j_relation; while(relation) { - if ((relation->channel_state == CHANNEL_STATE_CONNECT) + if ((relation->channel_state == 1) && (relation->rx_state != NOTIFY_STATE_SUSPEND) && (relation->rx_state != NOTIFY_STATE_HOLD)) relation->tx_state = notify_state_change(j_serial, relation->epoint_id, relation->tx_state, NOTIFY_STATE_HOLD); @@ -433,11 +416,11 @@ void JoinPBX::bridge(void) } else /* if conference/partyline (or more than two members and more than one is connected), so we set conference state */ { - PDEBUG(DEBUG_JOIN, "join%d %d members, %d connected, signal conference\n", relations, numconnect); + PDEBUG(DEBUG_JOIN, "join%d %d members, %d connected, signal conference\n", j_serial, relations, numconnect); relation = j_relation; while(relation) { - if ((relation->channel_state == CHANNEL_STATE_CONNECT) + if ((relation->channel_state == 1) && (relation->rx_state != NOTIFY_STATE_SUSPEND) && (relation->rx_state != NOTIFY_STATE_HOLD)) relation->tx_state = notify_state_change(j_serial, relation->epoint_id, relation->tx_state, NOTIFY_STATE_CONFERENCE); @@ -449,7 +432,7 @@ void JoinPBX::bridge(void) /* * bridging is only possible with two connected endpoints */ -void JoinPBX::bridge_data(unsigned long epoint_from, struct join_relation *relation_from, union parameter *param) +void JoinPBX::bridge_data(unsigned int epoint_from, struct join_relation *relation_from, union parameter *param) { struct join_relation *relation_to; @@ -462,7 +445,7 @@ void JoinPBX::bridge_data(unsigned long epoint_from, struct join_relation *relat return; /* skip if source endpoint has NOT audio mode CONNECT */ - if (relation_from->channel_state != CHANNEL_STATE_CONNECT) + if (relation_from->channel_state != 1) return; /* get destination relation */ @@ -474,7 +457,7 @@ void JoinPBX::bridge_data(unsigned long epoint_from, struct join_relation *relat } /* skip if destination endpoint has NOT audio mode CONNECT */ - if (relation_to->channel_state != CHANNEL_STATE_CONNECT) + if (relation_to->channel_state != 1) return; /* now we may send our data to the endpoint where it @@ -493,14 +476,14 @@ void JoinPBX::bridge_data(unsigned long epoint_from, struct join_relation *relat int JoinPBX::release(struct join_relation *relation, int location, int cause) { struct join_relation *reltemp, **relationpointer; - struct message *message; + struct lcr_msg *message; class Join *join; int destroy = 0; /* remove from bridge */ - if (relation->channel_state != CHANNEL_STATE_HOLD) + if (relation->channel_state != 0) { - relation->channel_state = CHANNEL_STATE_HOLD; + relation->channel_state = 0; j_updatebridge = 1; /* update bridge flag */ // note: if join is not released, bridge must be updated } @@ -566,7 +549,7 @@ int JoinPBX::release(struct join_relation *relation, int location, int cause) /* count number of relations in a join */ -int joinpbx_countrelations(unsigned long join_id) +int joinpbx_countrelations(unsigned int join_id) { struct join_relation *relation; int i; @@ -650,13 +633,13 @@ struct join_relation *JoinPBX::add_relation(void) /* epoint sends a message to a join * */ -void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union parameter *param) +void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union parameter *param) { class Join *cl; struct join_relation *relation, *reltemp; int num; int new_state; - struct message *message; + struct lcr_msg *message; // int size, writesize, oldpointer; char *number, *numbers; @@ -717,7 +700,7 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa message->param.connectinfo.ntype = INFO_NTYPE_UNKNOWN; message_put(message); j_updatebridge = 1; /* update bridge flag */ - if (j_relation->next && j_partyline_jingle) + if (j_partyline_jingle) play_jingle(1); break; @@ -743,7 +726,7 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa case MESSAGE_RELEASE: PDEBUG(DEBUG_JOIN, "releasing from join\n"); release(relation, 0, 0); - if (j_relation && j_partyline_jingle) + if (j_partyline_jingle) play_jingle(0); break; @@ -855,6 +838,12 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa break; case RELATION_TYPE_CALLING: /* by calling */ + /* remove us, if we don't have a called releation yet */ + if (!j_relation->next) + { + release(j_relation, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL); + return; // must return, because join IS destroyed + } /* remove all relations that are in called */ release_again2: reltemp = j_relation; @@ -997,10 +986,10 @@ int track_notify(int oldstate, int notify) * if other outgoing endpoints already exists, they are release as well. * note: if this functions fails, it will destroy its own join object! */ -int JoinPBX::out_setup(unsigned long epoint_id, int message_type, union parameter *param, char *newnumber) +int JoinPBX::out_setup(unsigned int epoint_id, int message_type, union parameter *param, char *newnumber) { struct join_relation *relation; - struct message *message; + struct lcr_msg *message; class Endpoint *epoint; PDEBUG(DEBUG_JOIN, "no endpoint found, so we will create an endpoint and send the setup message we have.\n"); @@ -1008,14 +997,14 @@ int JoinPBX::out_setup(unsigned long epoint_id, int message_type, union paramete if (!(relation=add_relation())) FATAL("No memory for relation.\n"); relation->type = RELATION_TYPE_SETUP; - relation->channel_state = CHANNEL_STATE_HOLD; /* audio is assumed on a new join */ + relation->channel_state = 0; /* audio is assumed on a new join */ relation->tx_state = NOTIFY_STATE_ACTIVE; /* new joins always assumed to be active */ relation->rx_state = NOTIFY_STATE_ACTIVE; /* new joins always assumed to be active */ /* create a new endpoint */ epoint = new Endpoint(0, j_serial); if (!epoint) FATAL("No memory for Endpoint instance\n"); - 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"); relation->epoint_id = epoint->ep_serial; /* send setup message to new endpoint */ @@ -1036,13 +1025,18 @@ int JoinPBX::out_setup(unsigned long epoint_id, int message_type, union paramete void JoinPBX::play_jingle(int in) { struct join_relation *relation; - struct message *message; + struct lcr_msg *message; relation = j_relation; + + if (!relation) + return; + if (!relation->next) + return; while(relation) { message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_TONE); - SCPY(message->param.tone.name, (char *)((in)?"left":"joined")); + SCPY(message->param.tone.name, (char *)((in)?"joined":"left")); message_put(message); relation = relation->next; }