X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.cpp;h=5d88fa232b8341121b467b143e00a2bc55269376;hp=d21daf35e344d7d879dc88861e372763533e93d1;hb=fa1f601f49879958ac9fc698b044012c772ec7da;hpb=3ac6881c22bce18091f19b06958ac66016bf9a32

diff --git a/joinpbx.cpp b/joinpbx.cpp
index d21daf3..5d88fa2 100644
--- a/joinpbx.cpp
+++ b/joinpbx.cpp
@@ -202,6 +202,7 @@ void joinpbx_debug(class JoinPBX *joinpbx, const char *function)
 	PDEBUG(DEBUG_JOIN, "end\n");
 }
 
+int update_bridge(struct lcr_work *work, void *instance, int index);
 
 /*
  * constructor for a new join 
@@ -223,11 +224,13 @@ JoinPBX::JoinPBX(class Endpoint *epoint) : Join()
 	j_dialed[0] = '\0';
 	j_todial[0] = '\0';
 	j_pid = getpid();
-	j_updatebridge = 0;
 	j_partyline = 0;
 	j_partyline_jingle = 0;
+	j_3pty = 0;
 	j_multicause = 0;
 	j_multilocation = 0;
+	memset(&j_updatebridge, 0, sizeof(j_updatebridge));
+	add_work(&j_updatebridge, update_bridge, this, 0);
 
 	/* initialize a relation only to the calling interface */
 	relation = j_relation = (struct join_relation *)MALLOC(sizeof(struct join_relation));
@@ -258,12 +261,36 @@ JoinPBX::~JoinPBX()
 		cmemuse--;
 		relation = rtemp;
 	}
+
+	/* remove 3PTY from other join */
+	if (j_3pty) {
+		class Join *join;
+		class JoinPBX *joinpbx;
+
+		join = find_join_id(j_3pty);
+		if (join && join->j_type == JOIN_TYPE_PBX) {
+			joinpbx = (class JoinPBX *)join;
+			joinpbx->j_3pty = 0;
+			trigger_work(&joinpbx->j_updatebridge);
+		}
+	}
+
+	del_work(&j_updatebridge);
 }
 
 
 /* bridge sets the audio flow of all bchannels assiociated to 'this' join
  * also it changes and notifies active/hold/conference states
  */
+int update_bridge(struct lcr_work *work, void *instance, int index)
+{
+	 class JoinPBX *joinpbx = (class JoinPBX *)instance;
+
+	 joinpbx->bridge();
+
+	 return 0;
+}
+
 void JoinPBX::bridge(void)
 {
 	struct join_relation *relation;
@@ -272,12 +299,23 @@ void JoinPBX::bridge(void)
 	class Endpoint *epoint;
 	struct port_list *portlist;
 	class Port *port;
+	unsigned int bridge_id;
+	class Join *join_3pty;
+	class JoinPBX *joinpbx_3pty;
 #ifdef DEBUG_COREBRIDGE
 	int allmISDN = 0; // never set for debug purpose
 #else
 	int allmISDN = 1; // set until a non-mISDN relation is found
 #endif
 
+	/* bridge id is the serial of join
+	 * if we have a 3pty with another join, we always use the lowest brigde id.
+	 * this way we use common ids, so both joins share same bridge */
+	if (j_3pty && j_3pty < j_serial)
+		bridge_id = j_3pty;
+	else
+		bridge_id = j_serial;
+
 	relation = j_relation;
 	while(relation) {
 		/* count all relations */
@@ -320,10 +358,65 @@ void JoinPBX::bridge(void)
 			relation = relation->next;
 			continue;
 		}
-		
+
 		relation = relation->next;
 	}
 
+	/* check if 3pty members have no mISDN, so bridging via mISDN/lcr will be selected correctly */
+	join_3pty = find_join_id(j_3pty);
+	if (join_3pty && join_3pty->j_type == JOIN_TYPE_PBX) {
+		joinpbx_3pty = (class JoinPBX *)join_3pty;
+		relation = joinpbx_3pty->j_relation;
+		while(relation) {
+
+#if 0
+no need to count, because j_3pty is taken into account below when checking relations
+			/* count all relations */
+			relations++;
+#endif
+
+			/* check for relation's objects */
+			epoint = find_epoint_id(relation->epoint_id);
+			if (!epoint) {
+				PERROR("software error: relation without existing endpoints.\n");
+				relation = relation->next;
+				continue;
+			}
+			portlist = epoint->ep_portlist;
+			if (!portlist) {
+				PDEBUG(DEBUG_JOIN, "other 3pty join %d: ignoring relation without port object.\n", joinpbx_3pty->j_serial);
+//#warning testing: keep on hold until single audio stream available
+				relation->channel_state = 0;
+				relation = relation->next;
+				continue;
+			}
+			if (portlist->next) {
+				PDEBUG(DEBUG_JOIN, "other 3pty join %d: ignoring relation with ep%d due to port_list.\n", joinpbx_3pty->j_serial, epoint->ep_serial);
+//#warning testing: keep on hold until single audio stream available
+				relation->channel_state = 0;
+				relation = relation->next;
+				continue;
+			}
+			port = find_port_id(portlist->port_id);
+			if (!port) {
+				PDEBUG(DEBUG_JOIN, "other 3pty join %d: ignoring relation without existing port object.\n", joinpbx_3pty->j_serial);
+				relation = relation->next;
+				continue;
+			}
+			if ((port->p_type&PORT_CLASS_MASK)!=PORT_CLASS_mISDN) {
+				PDEBUG(DEBUG_JOIN, "other 3pty join %d: ignoring relation ep%d because it's port is not mISDN.\n", joinpbx_3pty->j_serial, epoint->ep_serial);
+				if (allmISDN) {
+					PDEBUG(DEBUG_JOIN, "other 3pty join %d: not all endpoints are mISDN.\n", joinpbx_3pty->j_serial);
+					allmISDN = 0;
+				}
+				relation = relation->next;
+				continue;
+			}
+
+			relation = relation->next;
+		}
+	}
+
 	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 = j_relation;
@@ -335,6 +428,8 @@ void JoinPBX::bridge(void)
 			numconnect ++;
 
 		/* remove unconnected parties from conference, also remove remotely disconnected parties so conference will not be disturbed. */
+
+		/* mISDN */
 		if (relation->channel_state == 1
 		 && relation->rx_state != NOTIFY_STATE_HOLD
 		 && relation->rx_state != NOTIFY_STATE_SUSPEND
@@ -342,7 +437,7 @@ void JoinPBX::bridge(void)
 		 && allmISDN) { // no conf if any member is not mISDN
 			message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_mISDNSIGNAL);
 			message->param.mISDNsignal.message = mISDNSIGNAL_CONF;
-			message->param.mISDNsignal.conf = j_serial<<16 | j_pid;
+			message->param.mISDNsignal.conf = (bridge_id << 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 {
@@ -353,30 +448,35 @@ void JoinPBX::bridge(void)
 			message_put(message);
 		}
 
-		/*
-		 * request data from endpoint/port if:
-		 * - two relations
-		 * - any without mISDN
-		 * in this case we bridge
-		 */
-		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", j_serial, relation->epoint_id, message->param.mISDNsignal.joindata);
-		message_put(message);
+		/* core bridge */
+		if (relation->channel_state == 1
+		 && relation->rx_state != NOTIFY_STATE_HOLD
+		 && relation->rx_state != NOTIFY_STATE_SUSPEND
+		 && relations>1 // no bridge with one member
+		 && !allmISDN) { // no bridge if all members are mISDN
+			message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_BRIDGE);
+			message->param.bridge_id = bridge_id;
+			PDEBUG(DEBUG_JOIN, "join%u EP%u requests bridge=%u\n", j_serial, relation->epoint_id, bridge_id);
+			message_put(message);
+		} else {
+			message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_BRIDGE);
+			message->param.bridge_id = 0;
+			PDEBUG(DEBUG_JOIN, "join%u EP%u drop bridge=%u\n", j_serial, relation->epoint_id, bridge_id);
+			message_put(message);
+		}
 
 		relation = relation->next;
 	}
 
 	/* two people just exchange their states */
-	if (relations==2 && !j_partyline) {
+	if (!j_3pty && relations==2 && !j_partyline) {
 		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)/* && !j_partyline_jingle*/) {
+	if (!j_3pty && (relations==1 || numconnect==1)/* && !j_partyline_jingle*/) {
 		PDEBUG(DEBUG_JOIN, "join%d 1 member or only 1 connected, put on hold\n", j_serial);
 		relation = j_relation;
 		while(relation) {
@@ -400,43 +500,6 @@ void JoinPBX::bridge(void)
 	}
 }
 
-/*
- * bridging is only possible with two connected endpoints
- */
-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 (!j_relation->next)
-		return;
-
-	/* if we are more than two */
-	if (j_relation->next->next)
-		return;
-
-	/* skip if source endpoint has NOT audio mode CONNECT */
-	if (relation_from->channel_state != 1)
-		return;
-
-	/* get destination relation */
-	relation_to = j_relation;
-	if (relation_to == relation_from) {
-		/* oops, we are the first, so destination is: */
-		relation_to = relation_to->next;
-	}
-
-	/* skip if destination endpoint has NOT audio mode 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(j_serial, relation_to->epoint_id, JOIN_TO_EPOINT, param);
-}
-
 /* release join from endpoint
  * if the join has two relations, all relations are freed and the join will be
  * destroyed
@@ -453,7 +516,7 @@ int JoinPBX::release(struct join_relation *relation, int location, int cause)
 	/* remove from bridge */
 	if (relation->channel_state != 0) {
 		relation->channel_state = 0;
-		j_updatebridge = 1; /* update bridge flag */
+		trigger_work(&j_updatebridge);
 		// note: if join is not released, bridge must be updated
 	}
 
@@ -525,9 +588,6 @@ int joinpbx_countrelations(unsigned int join_id)
 	if (!join)
 		return(0);
 
-	if (join->j_type == JOIN_TYPE_REMOTE)
-		return(2);
-
 	if (join->j_type != JOIN_TYPE_PBX)
 		return(0);
 	joinpbx = (class JoinPBX *)join;
@@ -638,7 +698,7 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 //		joinpbx_debug(join,"Join::message_epoint");
 //	}
 	if (options.deb & DEBUG_JOIN) {
-		if (message_type != MESSAGE_DATA) {
+		if (message_type) {
 			cl = join_first;
 			while(cl) {
 				if (cl->j_type == JOIN_TYPE_PBX)
@@ -677,7 +737,7 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 			SPRINT(message->param.connectinfo.id, "%d", j_partyline);
 			message->param.connectinfo.ntype = INFO_NTYPE_UNKNOWN;
 			message_put(message);
-			j_updatebridge = 1; /* update bridge flag */
+			trigger_work(&j_updatebridge);
 			if (j_partyline_jingle)
 			       play_jingle(1);
 			break;
@@ -686,12 +746,32 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 			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 */
+				trigger_work(&j_updatebridge);
 				if (options.deb & DEBUG_JOIN)
 					joinpbx_debug(this, "Join::message_epoint{after setting new channel state}");
 			}
 			break;
 
+			/* track notify */
+			case MESSAGE_NOTIFY:
+			switch(param->notifyinfo.notify) {
+				case INFO_NOTIFY_USER_SUSPENDED:
+				case INFO_NOTIFY_USER_RESUMED:
+				case INFO_NOTIFY_REMOTE_HOLD:
+				case INFO_NOTIFY_REMOTE_RETRIEVAL:
+				case INFO_NOTIFY_CONFERENCE_ESTABLISHED:
+				case INFO_NOTIFY_CONFERENCE_DISCONNECTED:
+				new_state = track_notify(relation->rx_state, param->notifyinfo.notify);
+				if (new_state != relation->rx_state) {
+					relation->rx_state = new_state;
+					trigger_work(&j_updatebridge);
+					if (options.deb & DEBUG_JOIN)
+						joinpbx_debug(this, "Join::message_epoint{after setting new rx state}");
+				}
+				break;
+			}
+			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);
@@ -718,10 +798,10 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 	switch(message_type) {
 		/* process audio path message */
 		case MESSAGE_AUDIOPATH:
-		PDEBUG(DEBUG_JOIN, "join received channel message: %d.\n", param->audiopath);
+		PDEBUG(DEBUG_JOIN, "join received channel message: audiopath=%d, current relation's channel_state=%d\n", param->audiopath, relation->channel_state);
 		if (relation->channel_state != param->audiopath) {
 			relation->channel_state = param->audiopath;
-			j_updatebridge = 1; /* update bridge flag */
+			trigger_work(&j_updatebridge);
 			if (options.deb & DEBUG_JOIN)
 				joinpbx_debug(this, "Join::message_epoint{after setting new channel state}");
 		}
@@ -739,7 +819,7 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 			new_state = track_notify(relation->rx_state, param->notifyinfo.notify);
 			if (new_state != relation->rx_state) {
 				relation->rx_state = new_state;
-				j_updatebridge = 1;
+				trigger_work(&j_updatebridge);
 				if (options.deb & DEBUG_JOIN)
 					joinpbx_debug(this, "Join::message_epoint{after setting new rx state}");
 			}
@@ -759,12 +839,6 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 		}
 		return;
 
-		/* audio data */
-		case MESSAGE_DATA:
-		/* now send audio data to the other endpoint */
-		bridge_data(epoint_id, relation, param);
-		return;
-
 		/* relations sends a connect */
 		case MESSAGE_CONNECT:
 		/* outgoing setup type becomes connected */
@@ -853,19 +927,25 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 		switch(message_type) {
 			case MESSAGE_SETUP:
 			if (param->setup.dialinginfo.itype == INFO_ITYPE_ISDN_EXTENSION) {
-				numbers = param->setup.dialinginfo.id;
-				while((number = strsep(&numbers, ","))) {
-					if (out_setup(epoint_id, message_type, param, number, NULL))
-						return; // join destroyed
+				/* in case of keypad */
+				numbers = param->setup.dialinginfo.keypad;
+				if (numbers[0]) {
+					while((number = strsep(&numbers, ","))) {
+						if (out_setup(epoint_id, message_type, param, NULL, number))
+							return; // join destroyed
+					}
+					/* after keypad finish dialing */
+					break;
 				}
+				/* dialed number */
 				numbers = param->setup.dialinginfo.id;
 				while((number = strsep(&numbers, ","))) {
-					if (out_setup(epoint_id, message_type, param, NULL, number))
+					if (out_setup(epoint_id, message_type, param, number, NULL))
 						return; // join destroyed
 				}
 				break;
 			}
-			if (out_setup(epoint_id, message_type, param, NULL, NULL))
+			if (out_setup(epoint_id, message_type, param, param->setup.dialinginfo.id, param->setup.dialinginfo.keypad))
 				return; // join destroyed
 			break;
 
@@ -889,30 +969,6 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 }
 
 
-/* join process is called from the main loop
- * it processes the current calling state.
- * returns 0 if join nothing was done
- */
-int JoinPBX::handler(void)
-{
-//	struct join_relation *relation;
-//	char dialing[32][32];
-//	int port[32];
-//	int found;
-//	int i, j;
-//	char *p;
-
-	/* the bridge must be updated */
-	if (j_updatebridge) {
-		bridge();
-		j_updatebridge = 0;
-		return(1);
-	}
-
-	return(0);
-}
-
-
 int track_notify(int oldstate, int notify)
 {
 	int newstate = oldstate;
@@ -968,8 +1024,7 @@ int JoinPBX::out_setup(unsigned int epoint_id, int message_type, union parameter
 	epoint = new Endpoint(0, j_serial);
 	if (!epoint)
 		FATAL("No memory for Endpoint instance\n");
-	if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint, 1))) // outgoing
-		FATAL("No memory for Endpoint Application instance\n");
+	epoint->ep_app = new_endpointapp(epoint, 1, EAPP_TYPE_PBX); // outgoing
 	relation->epoint_id = epoint->ep_serial;
 	/* send setup message to new endpoint */
 //printf("JOLLY DEBUG: %d\n",join_countrelations(j_serial));
@@ -979,8 +1034,12 @@ int JoinPBX::out_setup(unsigned int epoint_id, int message_type, union parameter
 	memcpy(&message->param, param, sizeof(union parameter));
 	if (newnumber)
 		SCPY(message->param.setup.dialinginfo.id, newnumber);
+	else
+		message->param.setup.dialinginfo.id[0] = '\0';
 	if (newkeypad)
 		SCPY(message->param.setup.dialinginfo.keypad, newkeypad);
+	else
+		message->param.setup.dialinginfo.keypad[0] = '\0';
 	PDEBUG(DEBUG_JOIN, "setup message sent to ep %d with number='%s' keypad='%s'.\n", relation->epoint_id, message->param.setup.dialinginfo.id, message->param.setup.dialinginfo.keypad);
 	message_put(message);
 	return(0);