X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.cpp;h=929065779125b2087890f9f0708d8e0285b9841c;hp=5c686dcdb3afe7296920d7cf91bcc84016859cc2;hb=5b3a112115689caa6d145787e61c3716047ed49c;hpb=e9bfe48fc5254e79e59c6ffc1698912175edf4e3

diff --git a/joinpbx.cpp b/joinpbx.cpp
index 5c686dc..9290657 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,12 @@ 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_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 +260,23 @@ JoinPBX::~JoinPBX()
 		cmemuse--;
 		relation = rtemp;
 	}
+
+	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;
@@ -354,15 +367,13 @@ void JoinPBX::bridge(void)
 		}
 
 		/*
-		 * request data from endpoint/port if:
+		 * Bridge between port instances if:
 		 * - two relations
-		 * - any without mISDN
-		 * in this case we bridge
+		 * - one or all are not mISDN
 		 */
-		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 = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_BRIDGE);
+		message->param.bridge_id = (relations==2 && !allmISDN) ? j_serial : 0;
+		PDEBUG(DEBUG_JOIN, "join%u EP%u requests bridge=%u\n", j_serial, relation->epoint_id, message->param.bridge_id);
 		message_put(message);
 
 		relation = relation->next;
@@ -400,43 +411,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 +427,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,7 +499,7 @@ int joinpbx_countrelations(unsigned int join_id)
 	if (!join)
 		return(0);
 
-	if (join->j_type != JOIN_TYPE_REMOTE)
+	if (join->j_type == JOIN_TYPE_REMOTE)
 		return(2);
 
 	if (join->j_type != JOIN_TYPE_PBX)
@@ -542,6 +516,31 @@ int joinpbx_countrelations(unsigned int join_id)
 	return(i);
 }
 
+/* check if one is calling and all other relations are setup-realations */
+int joinpbx_onecalling_othersetup(struct join_relation *relation)
+{
+	int calling = 0, other = 0;
+
+	while(relation) {
+		switch(relation->type) {
+		case RELATION_TYPE_CALLING:
+			calling++;
+			break;
+		case RELATION_TYPE_SETUP:
+			break;
+		default:
+			other++;
+			break;
+		}
+
+		relation = relation->next;
+	}
+
+	if (calling == 1 && other == 0)
+		return(1);
+	return(0);
+}
+
 void JoinPBX::remove_relation(struct join_relation *relation)
 {
 	struct join_relation *temp, **tempp;
@@ -613,7 +612,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)
@@ -635,6 +634,9 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 		return;
 	}
 
+	/* count relations */
+	num=joinpbx_countrelations(j_serial);
+
 	/* process party line */
 	if (message_type == MESSAGE_SETUP) if (param->setup.partyline && !j_partyline) {
 		j_partyline = param->setup.partyline;
@@ -649,7 +651,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;
@@ -658,7 +660,7 @@ 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}");
 			}
@@ -690,10 +692,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}");
 		}
@@ -711,7 +713,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}");
 			}
@@ -731,12 +733,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 */
@@ -783,7 +779,12 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 				release(j_relation, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
 				return; // must return, because join IS destroyed
 			}
-			/* remove all relations that are in called */
+			/* in a conf, we don't kill the other members */
+			if (num > 2 && !joinpbx_onecalling_othersetup(j_relation)) {
+				release(relation, 0, 0);
+				return;
+			}
+			/* remove all relations that are of called type */
 			release_again2:
 			reltemp = j_relation;
 			while(reltemp) {
@@ -809,34 +810,36 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 		return; // must return, because join may be destroyed
 	}
 
-	/* count relations */
-	num=joinpbx_countrelations(j_serial);
-
 	/* check number of relations */
-	if (num > 2) {
-		PDEBUG(DEBUG_JOIN, "join has more than two relations so there is no need to send a message.\n");
+	if (num > 2 && !joinpbx_onecalling_othersetup(j_relation) && message_type != MESSAGE_CONNECT) {
+		PDEBUG(DEBUG_JOIN, "we are in a conference, so we ignore the messages, except MESSAGE_CONNECT.\n");
 		return;
 	}
 
-	/* find interfaces not related to calling epoint */
-	relation = j_relation;
-	while(relation) {
-		if (relation->epoint_id != epoint_id)
-			break;
-		relation = relation->next;
-	}
-	if (!relation) {
+	/* if join has no other relation, we process the setup message */
+	if (num == 1) {
 		switch(message_type) {
 			case MESSAGE_SETUP:
 			if (param->setup.dialinginfo.itype == INFO_ITYPE_ISDN_EXTENSION) {
+				/* 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, number))
+					if (out_setup(epoint_id, message_type, param, number, NULL))
 						return; // join destroyed
 				}
 				break;
 			}
-			if (out_setup(epoint_id, message_type, param, NULL))
+			if (out_setup(epoint_id, message_type, param, param->setup.dialinginfo.id, param->setup.dialinginfo.keypad))
 				return; // join destroyed
 			break;
 
@@ -844,36 +847,19 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 			PDEBUG(DEBUG_JOIN, "no need to send a message because there is no other endpoint than the calling one.\n");
 		}
 	} else {
-		PDEBUG(DEBUG_JOIN, "sending message ep%ld -> ep%ld.\n", epoint_id, relation->epoint_id);
-		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");
-	}
-}
-
-
-/* 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);
+		/* sending message to other relation(s) */
+		relation = j_relation;
+		while(relation) {
+			if (relation->epoint_id != epoint_id) {
+				PDEBUG(DEBUG_JOIN, "sending message ep%ld -> ep%ld.\n", epoint_id, relation->epoint_id);
+				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");
+			}
+			relation = relation->next;
+		}
 	}
-
-	return(0);
 }
 
 
@@ -914,7 +900,7 @@ 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 int 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, char *newkeypad)
 {
 	struct join_relation *relation;
 	struct lcr_msg *message;
@@ -932,8 +918,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));
@@ -943,7 +928,13 @@ 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);
-	PDEBUG(DEBUG_JOIN, "setup message sent to ep %d with number='%s'.\n", relation->epoint_id, message->param.setup.dialinginfo.id);
+	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);
 }