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

diff --git a/action.cpp b/action.cpp
index ce741c6..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 */
@@ -51,7 +51,7 @@ void EndpointAppPBX::_action_init_call(char *remote)
 			message_disconnect_port(portlist, CAUSE_OUTOFORDER, LOCATION_PRIVATE_LOCAL, "");
 			new_state(EPOINT_STATE_OUT_DISCONNECT);
 			set_tone(portlist,"cause_1b");
-			return;
+			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)
 {
@@ -358,7 +359,7 @@ void EndpointAppPBX::action_dialing_remote(void)
 	char			context[128] = "";
 	char 			remote[32];
 
-	if (e_state == EPOINT_STATE_IN_SETUP && !ea_endpoint->ep_join_id)
+	if (!ea_endpoint->ep_join_id)
 	{
 		/* no join yet, sending setup */
 		if (!(rparam = routeparam(e_action, PARAM_APPLICATION)))
@@ -371,7 +372,8 @@ void EndpointAppPBX::action_dialing_remote(void)
 			return;
 		}
 		SCPY(remote, rparam->string_value);
-		_action_init_call(remote);
+		if (!_action_init_call(remote))
+			return;
 
 		/* create bearer/caller/dialinginfo */
 		memcpy(&capainfo, &e_capainfo, sizeof(capainfo));
@@ -391,6 +393,7 @@ void EndpointAppPBX::action_dialing_remote(void)
 		{
 			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);
@@ -985,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--;
 
@@ -2006,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;
 
@@ -2019,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)))
@@ -2028,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);
@@ -2057,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 */