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");
UPRINT(strchr(buffer,0), "<port %ld doesn't exist>,", 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:
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_multicause = CAUSE_NOUSER;
+ j_multilocation = LOCATION_PRIVATE_LOCAL;
/* 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 */
{
struct join_relation *relation, *rtemp;
- relation = c_relation;
+ relation = j_relation;
while(relation)
{
rtemp = relation->next;
int allmISDN = 1; // set until a non-mISDN relation is found
#endif
- relation = c_relation;
+ relation = j_relation;
while(relation)
{
/* count all relations */
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 = relation->next;
}
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 = relation->next;
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;
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 */
&& 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);
}
* - 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)
{
PDEBUG(DEBUG_JOIN, "join%d 1 member or only 1 connected, put on hold\n");
- relation = c_relation;
+ relation = j_relation;
while(relation)
{
if ((relation->channel_state == CHANNEL_STATE_CONNECT)
&& (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 */
{
PDEBUG(DEBUG_JOIN, "join%d %d members, %d connected, signal conference\n", relations, numconnect);
- relation = c_relation;
+ relation = j_relation;
while(relation)
{
if ((relation->channel_state == CHANNEL_STATE_CONNECT)
&& (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;
}
}
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 */
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: */
* 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
if (relation->channel_state != CHANNEL_STATE_HOLD)
{
relation->channel_state = CHANNEL_STATE_HOLD;
- c_updatebridge = 1; /* update bridge flag */
+ 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 */
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 */
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);
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;
}
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++;
if (!relation)
return;
- temp = c_relation;
- tempp = &c_relation;
+ temp = j_relation;
+ tempp = &j_relation;
while(temp)
{
if (temp == relation)
{
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;
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;
}
}
/* check relation */
- relation = c_relation;
+ relation = j_relation;
while(relation)
{
if (relation->epoint_id == epoint_id)
}
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;
}
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}");
}
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}");
}
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);
}
relation->type = RELATION_TYPE_CONNECT;
/* release other relations in setup state */
release_again:
- relation = c_relation;
+ relation = j_relation;
while(relation)
{
if (relation->type == RELATION_TYPE_SETUP)
if (relation->type == RELATION_TYPE_SETUP)
{
/* collect cause and send collected cause */
- collect_cause(&c_multicause, &c_multilocation, param->disconnectinfo.cause, param->disconnectinfo.location);
- release(relation, c_multilocation, c_multicause);
+ collect_cause(&j_multicause, &j_multilocation, param->disconnectinfo.cause, param->disconnectinfo.location);
+ release(relation, j_multilocation, j_multicause);
} else
{
/* send current cause */
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;
+ j_partyline = param->setup.partyline;
+ message = message_create(j_serial, epoint_id, JOIN_TO_EPOINT, MESSAGE_CONNECT);
+ message->param.setup.partyline = j_partyline;
message_put(message);
- c_updatebridge = 1; /* update bridge flag */
+ j_updatebridge = 1; /* update bridge flag */
}
- if (c_partyline)
+ if (j_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 = 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);
return;
}
}
- if (c_partyline)
+ if (j_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)
}
/* find interfaces not related to calling epoint */
- relation = c_relation;
+ relation = j_relation;
while(relation)
{
if (relation->epoint_id != epoint_id)
} 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");
// char *p;
/* the bridge must be updated */
- if (c_updatebridge)
+ if (j_updatebridge)
{
bridge();
- c_updatebridge = 0;
+ j_updatebridge = 0;
return(1);
}
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, 0);
if (!epoint)
FATAL("No memory for Endpoint instance\n");
if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint)))
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);
projects / lcr.git / blobdiff