X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=action.cpp;h=d0a1c9f81391fffb74ef0bde62e8dac226392fa9;hp=ab8e5868672499337a6d247a3966c31039a558a3;hb=08aad9a8c5ad279759e0a870b1dd0d8159ce3444;hpb=0efcf371b4a61fa1376e83d2b7404aeb47a36e26

diff --git a/action.cpp b/action.cpp
index ab8e586..d0a1c9f 100644
--- a/action.cpp
+++ b/action.cpp
@@ -17,7 +17,7 @@ extern char **environ;
 /*
  * process init 'internal' / 'external' / 'remote' / 'vbox-record' / 'partyline'...
  */
-void EndpointAppPBX::_action_init_call(char *remote)
+int EndpointAppPBX::_action_init_call(char *remote)
 {
 	class Join		*join;
 	struct port_list	*portlist = ea_endpoint->ep_portlist;
@@ -28,7 +28,7 @@ void EndpointAppPBX::_action_init_call(char *remote)
 	{
 		if (options.deb & DEBUG_EPOINT)
 			PERROR("EPOINT(%d): We already have a call instance, this should never happen!\n", ea_endpoint->ep_serial);
-		return;
+		return(0);
 	}
 
 	/* create join */
@@ -48,10 +48,10 @@ void EndpointAppPBX::_action_init_call(char *remote)
 			trace_header("ACTION remote (not available)", DIRECTION_NONE);
 			add_trace("application", NULL, "%s", remote);
 			end_trace();
-			message_disconnect_port(portlist, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL, "");
+			message_disconnect_port(portlist, CAUSE_OUTOFORDER, LOCATION_PRIVATE_LOCAL, "");
 			new_state(EPOINT_STATE_OUT_DISCONNECT);
-			set_tone(portlist,"cause_22");
-			return;
+			set_tone(portlist,"cause_1b");
+			return(0);
 		}
 		join = new JoinRemote(ea_endpoint->ep_serial, remote, admin->sock);
 	}
@@ -60,6 +60,7 @@ void EndpointAppPBX::_action_init_call(char *remote)
 	if (!join)
 		FATAL("No memoy for Join instance.\n");
 	ea_endpoint->ep_join_id = join->j_serial;
+	return(1);
 }
 void EndpointAppPBX::action_init_call(void)
 {
@@ -67,52 +68,6 @@ void EndpointAppPBX::action_init_call(void)
 }
 void EndpointAppPBX::action_init_remote(void)
 {
-	struct route_param	*rparam;
-	struct port_list	*portlist = ea_endpoint->ep_portlist;
-	struct lcr_msg		*message;
-	struct capa_info	capainfo;
-	struct caller_info	callerinfo;
-	struct redir_info	redirinfo;
-	struct dialing_info	dialinginfo;
-	char			exten[128] = "";
-	char 			remote[32];
-
-	if (!(rparam = routeparam(e_action, PARAM_APPLICATION)))
-	{
-		trace_header("ACTION remote (no application given)", DIRECTION_NONE);
-		end_trace();
-		new_state(EPOINT_STATE_OUT_DISCONNECT);
-		message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, "");
-		set_tone(portlist, "cause_3f");
-		return;
-	}
-	SCPY(remote, rparam->string_value);
-	_action_init_call(remote);
-
-	/* create bearer/caller/dialinginfo */
-	memcpy(&capainfo, &e_capainfo, sizeof(capainfo));
-	memcpy(&callerinfo, &e_callerinfo, sizeof(callerinfo));
-	memcpy(&redirinfo, &e_redirinfo, sizeof(redirinfo));
-	memset(&dialinginfo, 0, sizeof(dialinginfo));
-
-	if ((rparam = routeparam(e_action, PARAM_EXTEN)))
-	{
-		SCPY(exten, rparam->string_value);
-	}
-	/* send setup to remote */
-	trace_header("ACTION remote (setup)", DIRECTION_NONE);
-	add_trace("number", NULL, dialinginfo.id);
-	add_trace("remote", NULL, remote);
-	if (exten[0])
-		add_trace("exten", NULL, remote);
-	end_trace();
-	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_SETUP);
-	memcpy(&message->param.setup.dialinginfo, &dialinginfo, sizeof(struct dialing_info));
-	memcpy(&message->param.setup.redirinfo, &redirinfo, sizeof(struct redir_info));
-	memcpy(&message->param.setup.callerinfo, &callerinfo, sizeof(struct caller_info));
-	memcpy(&message->param.setup.capainfo, &capainfo, sizeof(struct capa_info));
-	SCPY(message->param.setup.exten, exten);
-	message_put(message);
 }
 
 /*
@@ -394,22 +349,79 @@ void EndpointAppPBX::action_dialing_external(void)
 
 void EndpointAppPBX::action_dialing_remote(void)
 {
-	struct lcr_msg *message;
-	struct dialing_info dialinginfo;
-//	struct route_param *rparam;
-
-	/* create bearer/caller/dialinginfo */
-	memset(&dialinginfo, 0, sizeof(dialinginfo));
+	struct route_param	*rparam;
+	struct port_list	*portlist = ea_endpoint->ep_portlist;
+	struct lcr_msg		*message;
+	struct capa_info	capainfo;
+	struct caller_info	callerinfo;
+	struct redir_info	redirinfo;
+	struct dialing_info	dialinginfo;
+	char			context[128] = "";
+	char 			remote[32];
 
-	if (dialinginfo.id[0])
+	if (!ea_endpoint->ep_join_id)
 	{
-		/* add or update outgoing call */
-		trace_header("ACTION remote (dialing)", DIRECTION_NONE);
+		/* no join yet, sending setup */
+		if (!(rparam = routeparam(e_action, PARAM_APPLICATION)))
+		{
+			trace_header("ACTION remote (no application given)", DIRECTION_NONE);
+			end_trace();
+			new_state(EPOINT_STATE_OUT_DISCONNECT);
+			message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, "");
+			set_tone(portlist, "cause_3f");
+			return;
+		}
+		SCPY(remote, rparam->string_value);
+		if (!_action_init_call(remote))
+			return;
+
+		/* create bearer/caller/dialinginfo */
+		memcpy(&capainfo, &e_capainfo, sizeof(capainfo));
+		memcpy(&callerinfo, &e_callerinfo, sizeof(callerinfo));
+		memcpy(&redirinfo, &e_redirinfo, sizeof(redirinfo));
+		memset(&dialinginfo, 0, sizeof(dialinginfo));
+
+		if ((rparam = routeparam(e_action, PARAM_CONTEXT)))
+		{
+			SCPY(context, rparam->string_value);
+		}
+		if ((rparam = routeparam(e_action, PARAM_EXTEN)))
+		{
+			SCPY(dialinginfo.id, rparam->string_value);
+			dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
+		} else
+		{
+			SCPY(dialinginfo.id, e_extdialing);
+		}
+		e_extdialing = e_dialinginfo.id + strlen(e_dialinginfo.id);
+		/* send setup to remote */
+		trace_header("ACTION remote (setup)", DIRECTION_NONE);
 		add_trace("number", NULL, dialinginfo.id);
+		add_trace("remote", NULL, remote);
+		if (context[0])
+			add_trace("context", NULL, context);
 		end_trace();
-		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_INFORMATION);
-		memcpy(&message->param.information, &dialinginfo, sizeof(struct dialing_info));
+		message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_SETUP);
+		memcpy(&message->param.setup.dialinginfo, &dialinginfo, sizeof(struct dialing_info));
+		memcpy(&message->param.setup.redirinfo, &redirinfo, sizeof(struct redir_info));
+		memcpy(&message->param.setup.callerinfo, &callerinfo, sizeof(struct caller_info));
+		memcpy(&message->param.setup.capainfo, &capainfo, sizeof(struct capa_info));
+		SCPY(message->param.setup.context, context);
 		message_put(message);
+	} else
+	{
+		/* send overlap digits */
+		trace_header("ACTION remote (dialing)", DIRECTION_NONE);
+		add_trace("number", NULL, e_extdialing);
+		end_trace();
+		if (e_extdialing[0])
+		{
+			message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_INFORMATION);
+			memcpy(&message->param.information, &e_dialinginfo, sizeof(struct dialing_info));
+			SCPY(message->param.information.id, e_extdialing);
+			e_extdialing = e_dialinginfo.id + strlen(e_dialinginfo.id);
+			message_put(message);
+		}
 	}
 }
 
@@ -557,7 +569,7 @@ void EndpointAppPBX::action_init_partyline(void)
 		if (!(relation=joinpbx->add_relation()))
 			FATAL("No memory for join relation\n");
 		relation->type = RELATION_TYPE_SETUP;
-		relation->channel_state = CHANNEL_STATE_CONNECT;
+		relation->channel_state = 1;
 		relation->rx_state = NOTIFY_STATE_ACTIVE;
 		relation->tx_state = NOTIFY_STATE_ACTIVE;
 		relation->epoint_id = ea_endpoint->ep_serial;
@@ -976,12 +988,12 @@ void EndpointAppPBX::_action_redial_reply(int in)
 	{
 		/* find next entry */
 		e_select++;
-		if (e_select >= MAX_REMEMBER)
+		if (e_select >= MAX_REMEMBER) {
 			e_select--;
-		else if (in)
+		} else if (in) {
 			if (e_ext.last_in[e_select][0] == '\0')
 				e_select--;
-		else
+		} else
 			if (e_ext.last_out[e_select][0] == '\0')
 				e_select--;
 
@@ -1997,7 +2009,8 @@ void EndpointAppPBX::action_hangup_execute(void)
 {
 	struct route_param *rparam;
 	pid_t pid;
-	char *command = "", isdn_port[10];
+	char *command = (char *)"";
+	char isdn_port[10];
 	char *argv[11]; /* check also number of args below */
 	int i = 0;
 
@@ -2010,8 +2023,8 @@ void EndpointAppPBX::action_hangup_execute(void)
 		end_trace();
 		return;
 	}
-	argv[i++] = "/bin/sh";
-	argv[i++] = "-c";
+	argv[i++] = (char *)"/bin/sh";
+	argv[i++] = (char *)"-c";
 	argv[i++] = command;
 	argv[i++] = command;
 	if ((rparam = routeparam(e_action, PARAM_PARAM)))
@@ -2019,7 +2032,7 @@ void EndpointAppPBX::action_hangup_execute(void)
 		argv[i++] = rparam->string_value;
 	}
 	argv[i++] = e_extdialing;
-	argv[i++] = numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype, options.national, options.international);
+	argv[i++] = (char *)numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype, options.national, options.international);
 	argv[i++] = e_callerinfo.extension;
 	argv[i++] = e_callerinfo.name;
 	SPRINT(isdn_port, "%d", e_callerinfo.isdn_port);
@@ -2048,7 +2061,7 @@ void EndpointAppPBX::action_hangup_execute(void)
 void EndpointAppPBX::action_hangup_file(void)
 {
 	struct route_param *rparam;
-	char *file, *content, *mode;
+	const char *file, *content, *mode;
 	FILE *fp;
 
 	/* get file / content */