X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.cpp;h=630c59941332149e2d3364ccd8b0272076807ff4;hp=9f8f533f1e75ea97d1202573f49205846b219bde;hb=b2a665f8f1cdeb7d02c3f665d95e6a80297e21d1;hpb=5a22e57828617abc14e27814ee918cc63b96fd46 diff --git a/joinpbx.cpp b/joinpbx.cpp index 9f8f533..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; @@ -132,9 +123,9 @@ void joinpbx_debug(class JoinPBX *joinpbx, char *function) if (!(options.deb & DEBUG_JOIN)) return; - PDEBUG(DEBUG_JOIN, "join(%d) start (called from %s)\n", joinpbx->c_serial, function); + PDEBUG(DEBUG_JOIN, "join(%d) start (called from %s)\n", joinpbx->j_serial, function); - relation = joinpbx->c_relation; + relation = joinpbx->j_relation; if (!relation) PDEBUG(DEBUG_JOIN, "join has no relations\n"); @@ -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,11 +148,11 @@ 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->c_serial)?"yes":"no", (epoint->get_hold_id()==joinpbx->c_serial)?"yes":"no"); - UPRINT(strchr(buffer,0), " endpoint=%d on=%s", epoint->ep_serial, (epoint->ep_join_id==joinpbx->c_serial)?"yes":"no"); +// 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"); + UPRINT(strchr(buffer,0), " endpoint=%d on=%s", epoint->ep_serial, (epoint->ep_join_id==joinpbx->j_serial)?"yes":"no"); switch(relation->type) { case RELATION_TYPE_CALLING: @@ -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: @@ -247,22 +230,23 @@ JoinPBX::JoinPBX(class Endpoint *epoint) : Join() PDEBUG(DEBUG_JOIN, "creating new join and connecting it to the endpoint.\n"); - c_type = JOIN_TYPE_PBX; - c_caller[0] = '\0'; - c_caller_id[0] = '\0'; - c_dialed[0] = '\0'; - c_todial[0] = '\0'; - c_pid = getpid(); - c_updatebridge = 0; - c_partyline = 0; - c_multicause = CAUSE_NOUSER; - c_multilocation = LOCATION_PRIVATE_LOCAL; + j_type = JOIN_TYPE_PBX; + j_caller[0] = '\0'; + j_caller_id[0] = '\0'; + j_dialed[0] = '\0'; + j_todial[0] = '\0'; + j_pid = getpid(); + j_updatebridge = 0; + j_partyline = 0; + j_partyline_jingle = 0; + j_multicause = 0; + j_multilocation = 0; /* initialize a relation only to the calling interface */ - relation = c_relation = (struct join_relation *)MALLOC(sizeof(struct join_relation)); + 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; @@ -280,7 +264,7 @@ JoinPBX::~JoinPBX() { struct join_relation *relation, *rtemp; - relation = c_relation; + relation = j_relation; while(relation) { rtemp = relation->next; @@ -297,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; @@ -308,7 +292,7 @@ void JoinPBX::bridge(void) int allmISDN = 1; // set until a non-mISDN relation is found #endif - relation = c_relation; + relation = j_relation; while(relation) { /* count all relations */ @@ -325,33 +309,33 @@ void JoinPBX::bridge(void) portlist = epoint->ep_portlist; if (!portlist) { - PDEBUG(DEBUG_JOIN, "join%d ignoring relation without port object.\n", c_serial); + 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; } if (portlist->next) { - PDEBUG(DEBUG_JOIN, "join%d ignoring relation with ep%d due to port_list.\n", c_serial, epoint->ep_serial); + 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; } port = find_port_id(portlist->port_id); if (!port) { - PDEBUG(DEBUG_JOIN, "join%d ignoring relation without existing port object.\n", c_serial); + PDEBUG(DEBUG_JOIN, "join%d ignoring relation without existing port object.\n", j_serial); relation = relation->next; continue; } if ((port->p_type&PORT_CLASS_MASK)!=PORT_CLASS_mISDN) { - PDEBUG(DEBUG_JOIN, "join%d ignoring relation ep%d because it's port is not mISDN.\n", c_serial, epoint->ep_serial); + PDEBUG(DEBUG_JOIN, "join%d ignoring relation ep%d because it's port is not mISDN.\n", j_serial, epoint->ep_serial); if (allmISDN) { - PDEBUG(DEBUG_JOIN, "join%d not all endpoints are mISDN.\n", c_serial); + PDEBUG(DEBUG_JOIN, "join%d not all endpoints are mISDN.\n", j_serial); allmISDN = 0; } relation = relation->next; @@ -361,35 +345,35 @@ void JoinPBX::bridge(void) relation = relation->next; } - PDEBUG(DEBUG_JOIN, "join%d members=%d %s\n", c_serial, relations, (allmISDN)?"(all are mISDN-members)":"(not all are mISDN-members)"); + PDEBUG(DEBUG_JOIN, "join%d members=%d %s\n", j_serial, relations, (allmISDN)?"(all are mISDN-members)":"(not all are mISDN-members)"); /* we notify all relations about rxdata. */ - relation = c_relation; + relation = j_relation; 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 && allmISDN) // no conf if any member is not mISDN { - message = message_create(c_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_mISDNSIGNAL); + message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_mISDNSIGNAL); message->param.mISDNsignal.message = mISDNSIGNAL_CONF; - message->param.mISDNsignal.conf = c_serial<<16 | c_pid; - PDEBUG(DEBUG_JOIN, "join%d EP%d +on+ id: 0x%08x\n", c_serial, relation->epoint_id, message->param.mISDNsignal.conf); + message->param.mISDNsignal.conf = j_serial<<16 | j_pid; + PDEBUG(DEBUG_JOIN, "join%d EP%d +on+ id: 0x%08x\n", j_serial, relation->epoint_id, message->param.mISDNsignal.conf); message_put(message); } else { - message = message_create(c_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_mISDNSIGNAL); + message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_mISDNSIGNAL); message->param.mISDNsignal.message = mISDNSIGNAL_CONF; message->param.mISDNsignal.conf = 0; - PDEBUG(DEBUG_JOIN, "join%d EP%d +off+ id: 0x%08x\n", c_serial, relation->epoint_id, message->param.mISDNsignal.conf); + PDEBUG(DEBUG_JOIN, "join%d EP%d +off+ id: 0x%08x\n", j_serial, relation->epoint_id, message->param.mISDNsignal.conf); message_put(message); } @@ -399,47 +383,47 @@ void JoinPBX::bridge(void) * - any without mISDN * in this case we bridge */ - message = message_create(c_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_mISDNSIGNAL); + message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_mISDNSIGNAL); message->param.mISDNsignal.message = mISDNSIGNAL_JOINDATA; message->param.mISDNsignal.joindata = (relations==2 && !allmISDN); - PDEBUG(DEBUG_JOIN, "join%d EP%d set joindata=%d\n", c_serial, relation->epoint_id, message->param.mISDNsignal.joindata); + PDEBUG(DEBUG_JOIN, "join%d EP%d set joindata=%d\n", j_serial, relation->epoint_id, message->param.mISDNsignal.joindata); message_put(message); relation = relation->next; } /* two people just exchange their states */ - if (relations==2 && !c_partyline) + if (relations==2 && !j_partyline) { - PDEBUG(DEBUG_JOIN, "join%d 2 relations / no partyline\n", c_serial); - relation = c_relation; - relation->tx_state = notify_state_change(c_serial, relation->epoint_id, relation->tx_state, relation->next->rx_state); - relation->next->tx_state = notify_state_change(c_serial, relation->next->epoint_id, relation->next->tx_state, relation->rx_state); + PDEBUG(DEBUG_JOIN, "join%d 2 relations / no partyline\n", j_serial); + relation = j_relation; + relation->tx_state = notify_state_change(j_serial, relation->epoint_id, relation->tx_state, relation->next->rx_state); + 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) + if ((relations==1 || numconnect==1)/* && !j_partyline_jingle*/) { - PDEBUG(DEBUG_JOIN, "join%d 1 member or only 1 connected, put on hold\n"); - relation = c_relation; + 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(c_serial, relation->epoint_id, relation->tx_state, NOTIFY_STATE_HOLD); + relation->tx_state = notify_state_change(j_serial, relation->epoint_id, relation->tx_state, NOTIFY_STATE_HOLD); relation = relation->next; } } else - /* if conference/partyline or (more than two members and more than one is connected), so we set conference state */ + /* 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); - relation = c_relation; + 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(c_serial, relation->epoint_id, relation->tx_state, NOTIFY_STATE_CONFERENCE); + relation->tx_state = notify_state_change(j_serial, relation->epoint_id, relation->tx_state, NOTIFY_STATE_CONFERENCE); relation = relation->next; } } @@ -448,24 +432,24 @@ 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; /* if we are alone */ - if (!c_relation->next) + if (!j_relation->next) return; /* if we are more than two */ - if (c_relation->next->next) + if (j_relation->next->next) 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 */ - relation_to = c_relation; + relation_to = j_relation; if (relation_to == relation_from) { /* oops, we are the first, so destination is: */ @@ -473,14 +457,14 @@ 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 * will be delivered to the port */ //printf("from %d, to %d\n", relation_from->epoint_id, relation_to->epoint_id); - message_forward(c_serial, relation_to->epoint_id, JOIN_TO_EPOINT, param); + message_forward(j_serial, relation_to->epoint_id, JOIN_TO_EPOINT, param); } /* release join from endpoint @@ -492,21 +476,21 @@ 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; - c_updatebridge = 1; /* update bridge flag */ + relation->channel_state = 0; + j_updatebridge = 1; /* update bridge flag */ // note: if join is not released, bridge must be updated } /* detach given interface */ - reltemp = c_relation; - relationpointer = &c_relation; + reltemp = j_relation; + relationpointer = &j_relation; while(reltemp) { /* endpoint of function call */ @@ -517,13 +501,14 @@ int JoinPBX::release(struct join_relation *relation, int location, int cause) } if (!reltemp) FATAL("relation not in list of our relations. this must not happen.\n"); +//printf("releasing relation %d\n", reltemp->epoint_id); *relationpointer = reltemp->next; FREE(reltemp, sizeof(struct join_relation)); cmemuse--; relation = reltemp = NULL; // just in case of reuse fault; /* if no more relation */ - if (!c_relation) + if (!j_relation) { PDEBUG(DEBUG_JOIN, "join is completely removed.\n"); /* there is no more endpoint related to the join */ @@ -533,15 +518,15 @@ int JoinPBX::release(struct join_relation *relation, int location, int cause) PDEBUG(DEBUG_JOIN, "join completely removed!\n"); } else /* if join is a party line */ - if (c_partyline) + if (j_partyline) { PDEBUG(DEBUG_JOIN, "join is a conference room, so we keep it alive until the last party left.\n"); } else /* if only one relation left */ - if (!c_relation->next) + if (!j_relation->next) { PDEBUG(DEBUG_JOIN, "join has one relation left, so we send it a release with the given cause %d.\n", cause); - message = message_create(c_serial, c_relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_RELEASE); + message = message_create(j_serial, j_relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = cause; message->param.disconnectinfo.location = location; message_put(message); @@ -554,7 +539,7 @@ int JoinPBX::release(struct join_relation *relation, int location, int cause) join = join_first; while(join) { - if (options.deb & DEBUG_JOIN && join->c_type==JOIN_TYPE_PBX) + if (options.deb & DEBUG_JOIN && join->j_type==JOIN_TYPE_PBX) joinpbx_debug((class JoinPBX *)join, "join_release{all joins left}"); join = join->next; } @@ -564,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; @@ -576,15 +561,15 @@ int joinpbx_countrelations(unsigned long join_id) if (!join) return(0); - if (join->c_type != JOIN_TYPE_ASTERISK) + if (join->j_type != JOIN_TYPE_REMOTE) return(2); - if (join->c_type != JOIN_TYPE_PBX) + if (join->j_type != JOIN_TYPE_PBX) return(0); joinpbx = (class JoinPBX *)join; i = 0; - relation = joinpbx->c_relation; + relation = joinpbx->j_relation; while(relation) { i++; @@ -601,8 +586,8 @@ void JoinPBX::remove_relation(struct join_relation *relation) if (!relation) return; - temp = c_relation; - tempp = &c_relation; + temp = j_relation; + tempp = &j_relation; while(temp) { if (temp == relation) @@ -627,12 +612,12 @@ struct join_relation *JoinPBX::add_relation(void) { struct join_relation *relation; - if (!c_relation) + if (!j_relation) { PERROR("there is no first relation to this join\n"); return(NULL); } - relation = c_relation; + relation = j_relation; while(relation->next) relation = relation->next; @@ -648,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; @@ -676,7 +661,7 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa cl = join_first; while(cl) { - if (cl->c_type == JOIN_TYPE_PBX) + if (cl->j_type == JOIN_TYPE_PBX) joinpbx_debug((class JoinPBX *)cl, "Join::message_epoint{all joins before processing}"); cl = cl->next; } @@ -684,7 +669,7 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa } /* check relation */ - relation = c_relation; + relation = j_relation; while(relation) { if (relation->epoint_id == epoint_id) @@ -693,19 +678,75 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa } if (!relation) { - PDEBUG(DEBUG_JOIN, "no relation back to the endpoint found, ignoring (join=%d, endpoint=%d)\n", c_serial, epoint_id); + PDEBUG(DEBUG_JOIN, "no relation back to the endpoint found, ignoring (join=%d, endpoint=%d)\n", j_serial, epoint_id); + return; + } + + /* process party line */ + if (message_type == MESSAGE_SETUP) if (param->setup.partyline && !j_partyline) + { + j_partyline = param->setup.partyline; + j_partyline_jingle = param->setup.partyline_jingle; + } + if (j_partyline) + { + switch(message_type) + { + case MESSAGE_SETUP: + PDEBUG(DEBUG_JOIN, "respsone with connect in partyline mode.\n"); + relation->type = RELATION_TYPE_CONNECT; + message = message_create(j_serial, epoint_id, JOIN_TO_EPOINT, MESSAGE_CONNECT); + SPRINT(message->param.connectinfo.id, "%d", j_partyline); + message->param.connectinfo.ntype = INFO_NTYPE_UNKNOWN; + message_put(message); + j_updatebridge = 1; /* update bridge flag */ + if (j_partyline_jingle) + play_jingle(1); + break; + + case MESSAGE_AUDIOPATH: + PDEBUG(DEBUG_JOIN, "join received channel message: %d.\n", param->audiopath); + if (relation->channel_state != param->audiopath) + { + relation->channel_state = param->audiopath; + j_updatebridge = 1; /* update bridge flag */ + if (options.deb & DEBUG_JOIN) + joinpbx_debug(this, "Join::message_epoint{after setting new channel state}"); + } + break; + + case MESSAGE_DISCONNECT: + PDEBUG(DEBUG_JOIN, "releasing after receiving disconnect, because join in partyline mode.\n"); + message = message_create(j_serial, epoint_id, JOIN_TO_EPOINT, MESSAGE_RELEASE); + message->param.disconnectinfo.cause = CAUSE_NORMAL; + message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; + message_put(message); + // fall through + + case MESSAGE_RELEASE: + PDEBUG(DEBUG_JOIN, "releasing from join\n"); + release(relation, 0, 0); + if (j_partyline_jingle) + play_jingle(0); + break; + + default: + PDEBUG(DEBUG_JOIN, "ignoring message, because join in partyline mode.\n"); + } return; } + + /* process messages */ switch(message_type) { - /* process channel message */ - case MESSAGE_CHANNEL: - PDEBUG(DEBUG_JOIN, "join received channel message: %d.\n", param->channel); - if (relation->channel_state != param->channel) + /* process audio path message */ + case MESSAGE_AUDIOPATH: + PDEBUG(DEBUG_JOIN, "join received channel message: %d.\n", param->audiopath); + if (relation->channel_state != param->audiopath) { - relation->channel_state = param->channel; - c_updatebridge = 1; /* update bridge flag */ + relation->channel_state = param->audiopath; + j_updatebridge = 1; /* update bridge flag */ if (options.deb & DEBUG_JOIN) joinpbx_debug(this, "Join::message_epoint{after setting new channel state}"); } @@ -725,7 +766,7 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa if (new_state != relation->rx_state) { relation->rx_state = new_state; - c_updatebridge = 1; + j_updatebridge = 1; if (options.deb & DEBUG_JOIN) joinpbx_debug(this, "Join::message_epoint{after setting new rx state}"); } @@ -733,12 +774,12 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa default: /* send notification to all other endpoints */ - reltemp = c_relation; + reltemp = j_relation; while(reltemp) { if (reltemp->epoint_id!=epoint_id && reltemp->epoint_id) { - message = message_create(c_serial, reltemp->epoint_id, JOIN_TO_EPOINT, MESSAGE_NOTIFY); + message = message_create(j_serial, reltemp->epoint_id, JOIN_TO_EPOINT, MESSAGE_NOTIFY); memcpy(&message->param, param, sizeof(union parameter)); message_put(message); } @@ -760,64 +801,79 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa relation->type = RELATION_TYPE_CONNECT; /* release other relations in setup state */ release_again: - relation = c_relation; - while(relation) + reltemp = j_relation; + while(reltemp) { - if (relation->type == RELATION_TYPE_SETUP) +//printf("connect, checking relation %d\n", reltemp->epoint_id); + if (reltemp->type == RELATION_TYPE_SETUP) { - if (release(relation, LOCATION_PRIVATE_LOCAL, CAUSE_NONSELECTED)) +//printf("relation %d is of type setup, releasing\n", reltemp->epoint_id); + /* send release to endpoint */ + message = message_create(j_serial, reltemp->epoint_id, JOIN_TO_EPOINT, MESSAGE_RELEASE); + message->param.disconnectinfo.cause = CAUSE_NONSELECTED; + message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; + message_put(message); + + if (release(reltemp, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL)) // dummy cause, should not be used, since calling and connected endpoint still exist afterwards. return; // must return, because join IS destroyed goto release_again; } - relation = relation->next; + if (reltemp->type == RELATION_TYPE_CALLING) + reltemp->type = RELATION_TYPE_CONNECT; + reltemp = reltemp->next; } break; // continue with our message /* release is sent by endpoint */ case MESSAGE_RELEASE: - if (relation->type == RELATION_TYPE_SETUP) + switch(relation->type) { + case RELATION_TYPE_SETUP: /* by called */ /* collect cause and send collected cause */ - collect_cause(&c_multicause, &c_multilocation, param->disconnectinfo.cause, param->disconnectinfo.location); - release(relation, c_multilocation, c_multicause); - } else - { + collect_cause(&j_multicause, &j_multilocation, param->disconnectinfo.cause, param->disconnectinfo.location); + if (j_multicause) + release(relation, j_multilocation, j_multicause); + else + release(relation, LOCATION_PRIVATE_LOCAL, CAUSE_UNSPECIFIED); + 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; + while(reltemp) + { + if (reltemp->type == RELATION_TYPE_SETUP) + { + /* send release to endpoint */ + message = message_create(j_serial, reltemp->epoint_id, JOIN_TO_EPOINT, message_type); + memcpy(&message->param, param, sizeof(union parameter)); + message_put(message); + + if (release(reltemp, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL)) + return; // must return, because join IS destroyed + goto release_again2; + } + reltemp = reltemp->next; + } + PERROR("we are still here, this should not happen\n"); + break; + + default: /* by connected */ /* send current cause */ release(relation, param->disconnectinfo.location, param->disconnectinfo.cause); } return; // must return, because join may be destroyed } - /* process party line */ - if (message_type == MESSAGE_SETUP) if (param->setup.partyline) - { - PDEBUG(DEBUG_JOIN, "respsone with connect in partyline mode.\n"); - c_partyline = param->setup.partyline; - message = message_create(c_serial, epoint_id, JOIN_TO_EPOINT, MESSAGE_CONNECT); - message->param.setup.partyline = c_partyline; - message_put(message); - c_updatebridge = 1; /* update bridge flag */ - } - if (c_partyline) - { - if (message_type == MESSAGE_DISCONNECT) - { - PDEBUG(DEBUG_JOIN, "releasing after receiving disconnect, because join in partyline mode.\n"); - message = message_create(c_serial, epoint_id, JOIN_TO_EPOINT, MESSAGE_RELEASE); - message->param.disconnectinfo.cause = CAUSE_NORMAL; - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - message_put(message); - return; - } - } - if (c_partyline) - { - PDEBUG(DEBUG_JOIN, "ignoring message, because join in partyline mode.\n"); - return; - } - /* count relations */ - num=joinpbx_countrelations(c_serial); + num=joinpbx_countrelations(j_serial); /* check number of relations */ if (num > 2) @@ -827,7 +883,7 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa } /* find interfaces not related to calling epoint */ - relation = c_relation; + relation = j_relation; while(relation) { if (relation->epoint_id != epoint_id) @@ -859,7 +915,7 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa } else { PDEBUG(DEBUG_JOIN, "sending message ep%ld -> ep%ld.\n", epoint_id, relation->epoint_id); - message = message_create(c_serial, relation->epoint_id, JOIN_TO_EPOINT, message_type); + message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, message_type); memcpy(&message->param, param, sizeof(union parameter)); message_put(message); PDEBUG(DEBUG_JOIN, "message sent.\n"); @@ -881,10 +937,10 @@ int JoinPBX::handler(void) // char *p; /* the bridge must be updated */ - if (c_updatebridge) + if (j_updatebridge) { bridge(); - c_updatebridge = 0; + j_updatebridge = 0; return(1); } @@ -930,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"); @@ -941,21 +997,21 @@ 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, c_serial, 0); + 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 */ -//printf("JOLLY DEBUG: %d\n",join_countrelations(c_serial)); +//printf("JOLLY DEBUG: %d\n",join_countrelations(j_serial)); //i if (options.deb & DEBUG_JOIN) // joinpbx_debug(join, "Join::message_epoint"); - message = message_create(c_serial, relation->epoint_id, JOIN_TO_EPOINT, message_type); + message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, message_type); memcpy(&message->param, param, sizeof(union parameter)); if (newnumber) SCPY(message->param.setup.dialinginfo.id, newnumber); @@ -965,3 +1021,25 @@ int JoinPBX::out_setup(unsigned long epoint_id, int message_type, union paramete } +/* send play message to all members to play join/release jingle */ +void JoinPBX::play_jingle(int in) +{ + struct join_relation *relation; + 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)?"joined":"left")); + message_put(message); + relation = relation->next; + } +} + +