X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=action.cpp;h=e0a884d3bddf1bc38992911de090c942c070d51f;hp=8c06137b150f17b4dedfb901120850a175e2b201;hb=5463e1b62a39ce417b610584e3d34a8bc30ac15e;hpb=6bf7c7f9db360d6031417b012dcb0e90e2251cd6

diff --git a/action.cpp b/action.cpp
index 8c06137..e0a884d 100644
--- a/action.cpp
+++ b/action.cpp
@@ -74,6 +74,7 @@ void EndpointAppPBX::action_dialing_internal(void)
 	struct capa_info	capainfo;
 	struct caller_info	callerinfo;
 	struct redir_info	redirinfo;
+	struct rtp_info		rtpinfo;
 	struct dialing_info	dialinginfo;
 	struct port_list	*portlist = ea_endpoint->ep_portlist;
 	struct lcr_msg		*message;
@@ -91,6 +92,7 @@ void EndpointAppPBX::action_dialing_internal(void)
 	memcpy(&capainfo, &e_capainfo, sizeof(capainfo));
 	memcpy(&callerinfo, &e_callerinfo, sizeof(callerinfo));
 	memcpy(&redirinfo, &e_redirinfo, sizeof(redirinfo));
+	memcpy(&rtpinfo, &e_rtpinfo, sizeof(rtpinfo));
 	memset(&dialinginfo, 0, sizeof(dialinginfo));
 	dialinginfo.itype = INFO_ITYPE_ISDN_EXTENSION;
 	SCPY(dialinginfo.id, e_dialinginfo.id);
@@ -111,6 +113,8 @@ void EndpointAppPBX::action_dialing_internal(void)
 			capainfo.bearer_mode = INFO_BMODE_PACKET;
 		}
 		capainfo.bearer_info1 = INFO_INFO1_NONE;
+		capainfo.hlc = INFO_HLC_NONE;
+		capainfo.exthlc = INFO_HLC_NONE;
 	}
 	if ((rparam = routeparam(e_action, PARAM_BMODE))) {
 		capainfo.bearer_mode = rparam->integer_value;
@@ -135,7 +139,7 @@ void EndpointAppPBX::action_dialing_internal(void)
 		trace_header("ACTION extension (extension doesn't exist)", DIRECTION_NONE);
 		add_trace("extension", NULL, dialinginfo.id);
 		end_trace();
-		release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0, 0);
+		release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0, 0, 0);
 		new_state(EPOINT_STATE_OUT_DISCONNECT);
 		message_disconnect_port(portlist, CAUSE_UNALLOCATED, LOCATION_PRIVATE_LOCAL, "");
 		set_tone(portlist, "cause_86");
@@ -147,7 +151,7 @@ void EndpointAppPBX::action_dialing_internal(void)
 		add_trace("extension", NULL, dialinginfo.id);
 		end_trace();
 		new_state(EPOINT_STATE_OUT_DISCONNECT);
-		release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0, 0);
+		release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0, 0, 0);
 		message_disconnect_port(portlist, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, "");
 		set_tone(portlist, "cause_81");
 		return;
@@ -162,6 +166,7 @@ void EndpointAppPBX::action_dialing_internal(void)
 	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));
+	memcpy(&message->param.setup.rtpinfo, &rtpinfo, sizeof(struct rtp_info));
 	message_put(message);
 }
 
@@ -172,6 +177,7 @@ void EndpointAppPBX::action_dialing_external(void)
 	struct capa_info capainfo;
 	struct caller_info callerinfo;
 	struct redir_info redirinfo;
+	struct rtp_info rtpinfo;
 	struct dialing_info dialinginfo;
 	char *p;
 	struct port_list *portlist = ea_endpoint->ep_portlist;
@@ -204,19 +210,24 @@ void EndpointAppPBX::action_dialing_external(void)
 	memcpy(&capainfo, &e_capainfo, sizeof(capainfo));
 	memcpy(&callerinfo, &e_callerinfo, sizeof(callerinfo));
 	memcpy(&redirinfo, &e_redirinfo, sizeof(redirinfo));
+	memcpy(&rtpinfo, &e_rtpinfo, sizeof(rtpinfo));
 	memset(&dialinginfo, 0, sizeof(dialinginfo));
 	dialinginfo.itype = INFO_ITYPE_ISDN;
-	dialinginfo.sending_complete = 0;
+//	dialinginfo.sending_complete = 0;
 	SCPY(dialinginfo.id, e_extdialing);
 
 	/* process prefix */
 	if ((rparam = routeparam(e_action, PARAM_PREFIX)))
 		SPRINT(dialinginfo.id, "%s%s", rparam->string_value, e_extdialing);
 
+	/* process keypad */
+	if ((rparam = routeparam(e_action, PARAM_KEYPAD))) {
+		SCPY(dialinginfo.keypad, dialinginfo.id);
+		dialinginfo.id[0] = '\0';
+	}
+
 	/* process number complete */
 	if ((rparam = routeparam(e_action, PARAM_COMPLETE)))
-		if ((rparam = routeparam(e_action, PARAM_PREFIX)))
-			SCPY(dialinginfo.id, rparam->string_value);
 		dialinginfo.sending_complete = 1;
 
 	/* process number type */
@@ -231,6 +242,8 @@ void EndpointAppPBX::action_dialing_external(void)
 			capainfo.bearer_mode = INFO_BMODE_PACKET;
 		}
 		capainfo.bearer_info1 = INFO_INFO1_NONE;
+		capainfo.hlc = INFO_HLC_NONE;
+		capainfo.exthlc = INFO_HLC_NONE;
 	}
 	if ((rparam = routeparam(e_action, PARAM_BMODE))) {
 		capainfo.bearer_mode = rparam->integer_value;
@@ -267,7 +280,7 @@ void EndpointAppPBX::action_dialing_external(void)
 	if (e_ext.rights < 2) {
 		trace_header("ACTION extern (calling denied)", DIRECTION_NONE);
 		end_trace();
-		release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, 0, 0);
+		release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, 0, 0, 0);
 		set_tone(portlist, "cause_82");
 		denied:
 		message_disconnect_port(portlist, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, "");
@@ -282,7 +295,7 @@ void EndpointAppPBX::action_dialing_external(void)
 		if (e_ext.rights < 3) {
 			trace_header("ACTION extern (national calls denied)", DIRECTION_NONE);
 			end_trace();
-			release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, 0, 0);
+			release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, 0, 0, 0);
 			set_tone(portlist, "cause_83");
 			goto denied;
 		}
@@ -294,7 +307,7 @@ void EndpointAppPBX::action_dialing_external(void)
 		if (e_ext.rights < 4) {
 			trace_header("ACTION extern (international calls denied)", DIRECTION_NONE);
 			end_trace();
-			release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, 0, 0);
+			release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, 0, 0, 0);
 			set_tone(portlist, "cause_84");
 			goto denied;
 		}
@@ -303,6 +316,8 @@ void EndpointAppPBX::action_dialing_external(void)
 	/* add or update outgoing call */
 	trace_header("ACTION extern (calling)", DIRECTION_NONE);
 	add_trace("number", NULL, dialinginfo.id);
+	if (dialinginfo.sending_complete)
+	add_trace("number", "complete", "yes");
 	if (dialinginfo.interfaces[0])
 		add_trace("interfaces", NULL, dialinginfo.interfaces);
 	end_trace();
@@ -311,6 +326,7 @@ void EndpointAppPBX::action_dialing_external(void)
 	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));
+	memcpy(&message->param.setup.rtpinfo, &rtpinfo, sizeof(struct rtp_info));
 	message_put(message);
 }
 
@@ -638,16 +654,16 @@ void EndpointAppPBX::action_dialing_login(void)
 		e_ruleset = NULL;
 		e_rule = NULL;
 		e_action = &action_password;
-		e_match_timeout = 0;
+		unsched_timer(&e_match_timeout);
 		e_match_to_action = NULL;
 		e_dialinginfo.id[0] = '\0';
 		e_extdialing = strchr(e_dialinginfo.id, '\0');
 
 		/* set timeout */
-		e_password_timeout = now+20;
+		schedule_timer(&e_password_timeout, 20, 0);
 
 		/* do dialing */
-		process_dialing();
+		process_dialing(0);
 	} else {
 		/* make call state  */
 		new_state(EPOINT_STATE_IN_OVERLAP);
@@ -939,7 +955,7 @@ void EndpointAppPBX::_action_redial_reply(int in)
 		SCPY(e_dialinginfo.id, last);
 		e_extdialing = e_dialinginfo.id;
 		e_action = NULL;
-		process_dialing();
+		process_dialing(0);
 		return;
 	}
 	e_extdialing[0] = '\0';
@@ -1033,10 +1049,10 @@ void EndpointAppPBX::action_dialing_powerdial(void)
 
 	/* do dialing */
 	SCPY(e_dialinginfo.id, e_ext.last_out[0]);
-	e_powerdialing = -1; /* indicates the existence of powerdialing but no redial time given */
+	e_powerdial_on = 1; /* indicates the existence of powerdialing but no redial time given */
 	e_powercount = 0;
 	e_action = NULL;
-	process_dialing();
+	process_dialing(0);
 }
 
 
@@ -1138,7 +1154,7 @@ void EndpointAppPBX::action_hangup_callback(void)
 	end_trace();
 
 	/* set time to callback */
-	e_callback = now_d + delay;
+	schedule_timer(&e_callback_timeout, delay, 0);
 }
 
 
@@ -1191,7 +1207,7 @@ void EndpointAppPBX::action_dialing_abbrev(void)
 	SCPY(e_dialinginfo.id, phone);
 	e_extdialing = e_dialinginfo.id;
 	e_action = NULL;
-	process_dialing();
+	process_dialing(0);
 }
 
 
@@ -1695,7 +1711,7 @@ void EndpointAppPBX::_action_goto_menu(int mode)
 
 	/* do dialing with new ruleset */
 	e_action = NULL;
-	process_dialing();
+	process_dialing(0);
 }
 
 /* process dialing goto
@@ -1775,6 +1791,48 @@ void EndpointAppPBX::action_dialing_disconnect(void)
 
 
 /*
+ * process dialing release
+ */
+void EndpointAppPBX::action_dialing_release(void)
+{
+	struct route_param *rparam;
+	int cause = CAUSE_NORMAL; /* normal call clearing */
+	int location = LOCATION_PRIVATE_LOCAL;
+	char cause_string[256] = "", display[84] = "";
+
+	/* check cause parameter */
+	if ((rparam = routeparam(e_action, PARAM_CAUSE))) {
+		cause = rparam->integer_value;
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): 'cause' is given: %d\n", ea_endpoint->ep_serial, cause);
+	}
+	if ((rparam = routeparam(e_action, PARAM_LOCATION))) {
+		location = rparam->integer_value;
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): 'location' is given: %d\n", ea_endpoint->ep_serial, location);
+	}
+
+
+	/* use cause as sample, if not given later */
+	SPRINT(cause_string, "cause_%02x", cause);
+
+	/* check display */
+	if ((rparam = routeparam(e_action, PARAM_DISPLAY))) {
+		SCPY(display, rparam->string_value);
+		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): 'display' is given: %s\n", ea_endpoint->ep_serial, display);
+	}
+
+	/* disconnect only if connect parameter is not given */
+	trace_header("ACTION release", DIRECTION_NONE);
+	add_trace("cause", "value", "%d", cause);
+	add_trace("cause", "location", "%d", location);
+	if (display[0])
+		add_trace("display", NULL, "%s", display);
+	end_trace();
+	e_action = NULL;
+	release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, location, cause, 1);
+	return;
+}
+
+/*
  * process dialing help
  */
 void EndpointAppPBX::action_dialing_help(void)
@@ -1833,7 +1891,7 @@ void EndpointAppPBX::action_dialing_help(void)
 		e_extdialing = e_dialinginfo.id+strlen(numbering->prefix);
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s selected a new menu '%s' dialing: %s\n", ea_endpoint->ep_serial, e_ext.number, numb_actions[numbering->action], e_dialinginfo.id);
 nesting?:
-		process_dialing();
+		process_dialing(0);
 		return;
 	}
 
@@ -1913,7 +1971,7 @@ void EndpointAppPBX::action_execute(void)
 	int iWaitStatus;
 	char *command = (char *)"";
 	char isdn_port[10];
-	char *argv[11]; /* check also number of args below */
+	char *argv[12]; /* check also number of args below */
 	int i = 0;
 
 	/* get script / command */
@@ -1924,9 +1982,11 @@ void EndpointAppPBX::action_execute(void)
 		end_trace();
 		return;
 	}
+#if 0
 	argv[i++] = (char *)"/bin/sh";
 	argv[i++] = (char *)"-c";
 	argv[i++] = command;
+#endif
 	argv[i++] = command;
 	if ((rparam = routeparam(e_action, PARAM_PARAM))) {
 		argv[i++] = rparam->string_value;
@@ -1937,6 +1997,7 @@ void EndpointAppPBX::action_execute(void)
 	argv[i++] = e_callerinfo.name;
 	SPRINT(isdn_port, "%d", e_callerinfo.isdn_port);
 	argv[i++] = isdn_port;
+	argv[i++] = e_callerinfo.imsi;
 	argv[i++] = NULL; /* check also number of args above */
 	switch (pid = fork ()) {
 		case -1:
@@ -1946,12 +2007,10 @@ void EndpointAppPBX::action_execute(void)
 		case 0:
 			/* To be shure there are no zombies created double fork */
 			if ((pid2 = fork()) == 0) {
-				execve("/bin/sh", argv, environ);
-			}
-			else {
-				/* Exit immediately and release the waiting parent. The subprocess falls to init because the parent died */
-				exit(0);
+				execve(command, argv, environ);
 			}
+			/* Exit immediately and release the waiting parent. The subprocess falls to init because the parent died */
+			exit(0);
 			break;
 		default:
 			trace_header("ACTION execute", DIRECTION_NONE);
@@ -2092,11 +2151,16 @@ void EndpointAppPBX::action_dialing_password_wr(void)
  * depending on the detected prefix, subfunctions above (action_*) will be
  * calles.
  */
-void EndpointAppPBX::process_dialing(void)
+void EndpointAppPBX::process_dialing(int timeout)
 {
 	struct port_list *portlist = ea_endpoint->ep_portlist;
 	struct lcr_msg *message;
 	struct route_param *rparam;
+	struct timeval current_time;
+
+	/* set if timeout is active, or if timeout value was given due to timeout action */
+	if (e_action_timeout.active)
+		timeout = 1;
 
 //#warning Due to HANG-BUG somewhere here, I added some HANG-BUG-DEBUGGING output that cannot be disabled. after bug has been found, this will be removed.
 //PDEBUG(~0, "HANG-BUG-DEBUGGING: entered porcess_dialing\n");
@@ -2105,8 +2169,8 @@ void EndpointAppPBX::process_dialing(void)
 	if (!portlist) {
 		portlist_error:
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): note: dialing call requires exactly one port object to process dialing. this case could happen due to a parked call. we end dialing here.\n", ea_endpoint->ep_serial, e_ext.number);
-		e_action_timeout = 0;
-		e_match_timeout = 0;
+		unsched_timer(&e_action_timeout);
+		unsched_timer(&e_match_timeout);
 		return;
 	}
 	if (portlist->next) {
@@ -2121,15 +2185,15 @@ void EndpointAppPBX::process_dialing(void)
 		new_state(EPOINT_STATE_OUT_DISCONNECT);
 		message_disconnect_port(portlist, CAUSE_UNSPECIFIED, LOCATION_PRIVATE_LOCAL, "");
 		set_tone(portlist, "cause_3f");
-		e_action_timeout = 0;
-		e_match_timeout = 0;
+		unsched_timer(&e_action_timeout);
+		unsched_timer(&e_match_timeout);
 		goto end;
 	}
 
 //PDEBUG(~0, "HANG-BUG-DEBUGGING: before action-timeout processing\n");
 	/* process timeout */
-	if (e_action && e_action_timeout) { /* e_action may be NULL, but e_action_timeout may still be set and must be ignored */
-		e_action_timeout = 0;
+	if (e_action && timeout) { /* e_action may be NULL, but e_action_timeout may still be set and must be ignored */
+		unsched_timer(&e_action_timeout);
 		if (e_state == EPOINT_STATE_CONNECT) {
 			PDEBUG(DEBUG_ROUTE|DEBUG_EPOINT, "EPOINT(%d): action timed out, but we already have connected, so we stop timer and continue.\n", ea_endpoint->ep_serial);
 			goto end;
@@ -2137,10 +2201,10 @@ void EndpointAppPBX::process_dialing(void)
 		if (e_action->index == ACTION_DISCONNECT
 		 || e_state == EPOINT_STATE_OUT_DISCONNECT) {
 			/* release after disconnect */
-			release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
+			release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0);
 			goto end;
 		}
-		release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0, 0);
+		release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0, 0, 0);
 		e_action = e_action->next;
 		if (!e_action) {
 			/* nothing more, so we release */
@@ -2157,7 +2221,7 @@ void EndpointAppPBX::process_dialing(void)
 	if (e_state!=EPOINT_STATE_IN_SETUP
 	 && e_state!=EPOINT_STATE_IN_OVERLAP) {
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d): we are not in incoming setup/overlap state, so we ignore init/dialing process.\n", ea_endpoint->ep_serial, e_rule_nesting);
-		e_match_timeout = 0;
+		unsched_timer(&e_match_timeout);
 		goto end;
 	}
 
@@ -2170,8 +2234,8 @@ void EndpointAppPBX::process_dialing(void)
 			e_dialinginfo.id[0] = '\0';
 			e_action = NUMB_ACTION_MENU;
 			e_menu = 0;
-			process_dialing();
-			e_match_timeout = 0;
+			process_dialing(0);
+			unsched_timer(&e_match_timeout);
 			goto end;
 		}
 		/* invalid dialing */
@@ -2188,7 +2252,7 @@ void EndpointAppPBX::process_dialing(void)
 		}
 		new_state(EPOINT_STATE_OUT_DISCONNECT);
 		set_tone(portlist,"cause_1c");
-		e_match_timeout = 0;
+		unsched_timer(&e_match_timeout);
 		goto end;
 	}
 #endif
@@ -2224,11 +2288,13 @@ void EndpointAppPBX::process_dialing(void)
 			goto process_action;
 		}
 
-		if (e_match_timeout && now_d>=e_match_timeout) {
+		gettimeofday(&current_time, NULL);
+		if (e_match_to_action && TIME_SMALLER(&e_match_timeout.timeout, &current_time)) {
 			/* return timeout rule */
 			PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal '%s' dialing: '%s', timeout in ruleset '%s'\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id, e_ruleset->name);
-			e_match_timeout = 0;
+			unsched_timer(&e_match_timeout);
 			e_action = e_match_to_action;
+			e_match_to_action = NULL;
 			e_extdialing = e_match_to_extdialing;
 			trace_header("ROUTING (timeout)", DIRECTION_NONE);
 			add_trace("action", NULL, "%s", action_defs[e_action->index].name);
@@ -2266,9 +2332,9 @@ void EndpointAppPBX::process_dialing(void)
 		action_timeout:
 
 		/* set timeout */
-		e_action_timeout = 0;
+		unsched_timer(&e_action_timeout);
 		if (e_action->timeout) {
-			e_action_timeout = now_d + e_action->timeout;
+			schedule_timer(&e_action_timeout, e_action->timeout, 0);
 			PDEBUG(DEBUG_ROUTE|DEBUG_EPOINT, "EPOINT(%d): action has a timeout of %d secods.\n", ea_endpoint->ep_serial, e_action->timeout);
 		}