X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=route.c;h=da59e987b806d78945b5b6333a0f1d75dd968afc;hp=ce5d22612aa07723cc25cbcee6f188ac99370189;hb=6bf7c7f9db360d6031417b012dcb0e90e2251cd6;hpb=6d3d13def341dcddb6fe4336d18ce2ac9b996029

diff --git a/route.c b/route.c
index ce5d226..da59e98 100644
--- a/route.c
+++ b/route.c
@@ -26,6 +26,8 @@ struct cond_defs cond_defs[] = {
 	  "interface=<interface>[,...]", "Matches if call is received from given interface(s). NOT PORTS!"},
 	{ "callerid",	MATCH_CALLERID,	COND_TYPE_STRING,
 	  "callerid=<digits>[-<digits>][,...]", "Matches if caller ID matches or begins with the given (range(s) of) prefixes(s)."},
+	{ "callerid2",	MATCH_CALLERID2,COND_TYPE_STRING,
+	  "callerid2=<digits>[-<digits>][,...]", "Matches the second caller ID (network provided)."},
 	{ "extension",	MATCH_EXTENSION,COND_TYPE_STRING,
 	  "extension=<digits>[-<digits>][,...]", "Matches if caller calls from given (range(s) of) extension(s)."},
 	{ "dialing",	MATCH_DIALING,	COND_TYPE_STRING,
@@ -237,6 +239,9 @@ struct param_defs param_defs[] = {
 	{ PARAM_EXTEN,
 	  "exten",	PARAM_TYPE_STRING,
 	  "exten=<extension>", "Give exten parameter to the remote application. (overrides dialed number)"},
+	{ PARAM_ON,
+	  "on",	PARAM_TYPE_STRING,
+	  "on=[init|hangup]", "Defines if the action is executed on call init or on hangup."},
 	{ 0, NULL, 0, NULL, NULL}
 };
 
@@ -324,7 +329,7 @@ struct action_defs action_defs[] = {
 //	  "Caller calls the timer."},
 	{ ACTION_GOTO,
 	  "goto",	NULL, &EndpointAppPBX::action_dialing_goto, NULL,
-	  PARAM_CONNECT | PARAM_RULESET | PARAM_STRIP | PARAM_SAMPLE,
+	  PARAM_PROCEEDING | PARAM_ALERTING | PARAM_CONNECT | PARAM_RULESET | PARAM_STRIP | PARAM_SAMPLE,
 	  "Jump to given ruleset and optionally play sample. Dialed digits are not flushed."},
 	{ ACTION_MENU,
 	  "menu",	NULL, &EndpointAppPBX::action_dialing_menu, NULL,
@@ -345,8 +350,8 @@ struct action_defs action_defs[] = {
 	  NULL},
 //	  "The call forward is set within the telephone network of the external line."},
 	{ ACTION_EXECUTE,
-	  "execute",	NULL, NULL, &EndpointAppPBX::action_hangup_execute,
-	  PARAM_CONNECT | PARAM_EXECUTE | PARAM_PARAM,
+	  "execute",	&EndpointAppPBX::action_init_execute, NULL, &EndpointAppPBX::action_hangup_execute,
+	  PARAM_CONNECT | PARAM_EXECUTE | PARAM_PARAM | PARAM_ON,
 	  "Executes the given script file. The file must terminate quickly, because it will halt the PBX."},
 	{ ACTION_FILE,
 	  "file",	NULL, NULL, &EndpointAppPBX::action_hangup_file,
@@ -875,7 +880,7 @@ struct route_ruleset *ruleset_parse(void)
 		j<<=1;
 	}
 
-        SPRINT(filename[0], "%s/routing.conf", INSTALL_DATA);
+        SPRINT(filename[0], "%s/routing.conf", CONFIG_DATA);
 
         if (!(fp[0]=fopen(filename[0],"r")))
         {
@@ -943,7 +948,7 @@ struct route_ruleset *ruleset_parse(void)
 			if (key[0] == '/')
 				SCPY(filename[nesting+1], key);
 			else
-	        		SPRINT(filename[nesting+1], "%s/%s", INSTALL_DATA, key);
+	        		SPRINT(filename[nesting+1], "%s/%s", CONFIG_DATA, key);
 		        if (!(fp[nesting+1]=fopen(filename[nesting+1],"r")))
 			{
 				PERROR("Cannot open %s\n", filename[nesting+1]);
@@ -1682,6 +1687,7 @@ struct route_ruleset *ruleset_parse(void)
 				case PARAM_TYPE_DESTIN:
 				case PARAM_TYPE_TYPE:
 				case PARAM_TYPE_YESNO:
+				case PARAM_TYPE_ON:
 				key[0] = '\0';
 				if (*p==',' || *p==' ' || *p=='\0')
 				{
@@ -1720,6 +1726,22 @@ struct route_ruleset *ruleset_parse(void)
 					SPRINT(failure, "Caller ID type '%s' unknown.", key);
 					goto parse_error;
 				}
+				if (param_defs[index].type == PARAM_TYPE_ON)
+				{
+					param->value_type = VALUE_TYPE_INTEGER;
+					if (!strcasecmp(key, "init"))
+					{
+						param->integer_value = INFO_ON_INIT;
+						break;
+					}
+					if (!strcasecmp(key, "hangup"))
+					{
+						param->integer_value = INFO_ON_HANGUP;
+						break;
+					}
+					SPRINT(failure, "Execute on '%s' unknown.", key);
+					goto parse_error;
+				}
 				if (param_defs[index].type == PARAM_TYPE_CAPABILITY)
 				{
 					param->value_type = VALUE_TYPE_INTEGER;
@@ -1956,7 +1978,7 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 	struct route_action	*action = NULL;
 	unsigned long		comp_len;
 	int			j, jj;
-	char			callerid[64],	redirid[64];
+	char			callerid[64], callerid2[64], redirid[64];
 	int			integer;
 	char			*string;
 	FILE			*tfp;
@@ -1969,6 +1991,7 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 	e_match_to_action = NULL;
 
 	SCPY(callerid, numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype, options.national, options.international));
+	SCPY(callerid2, numberrize_callerinfo(e_callerinfo.id2, e_callerinfo.ntype2, options.national, options.international));
 	SCPY(redirid, numberrize_callerinfo(e_redirinfo.id, e_redirinfo.ntype, options.national, options.international));
 	
 	PDEBUG(DEBUG_ROUTE, "parsing ruleset '%s'\n", ruleset->name);
@@ -1999,7 +2022,7 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 
 				case MATCH_PORT:
 				if (ea_endpoint->ep_portlist)
-				if ((ea_endpoint->ep_portlist->port_type & PORT_CLASS_mISDN_MASK) != PORT_CLASS_mISDN_DSS1)
+				if ((ea_endpoint->ep_portlist->port_type & PORT_CLASS_MASK) != PORT_CLASS_mISDN)
 					break;
 				integer = e_callerinfo.isdn_port;
 				goto match_integer;
@@ -2014,6 +2037,10 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 				string = callerid;
 				goto match_string_prefix;
 
+				case MATCH_CALLERID2:
+				string = callerid2;
+				goto match_string_prefix;
+
 				case MATCH_EXTENSION:
 				string = e_ext.name;
 				goto match_string;
@@ -2063,12 +2090,12 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 				break;
 
 				case MATCH_REDIRECTED:
-				if (e_redirinfo.present != INFO_PRESENT_NULL)
+				if (e_redirinfo.ntype != INFO_NTYPE_NOTPRESENT)
 					istrue = 1;
 				break;
 
 				case MATCH_DIRECT:
-				if (e_redirinfo.present == INFO_PRESENT_NULL)
+				if (e_redirinfo.ntype == INFO_NTYPE_NOTPRESENT)
 					istrue = 1;
 				break;