X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=route.c;h=743e37de5ce9921f3dbe8644becf17b53c4a2367;hp=8f1e3bb0bbae6d130c5ffe35f3e444198e006a17;hb=89d3a5de4769faafa46efb83e1e35db5b40f1309;hpb=95a9a7f135a2413b5b07d16bfee93f62660a203b

diff --git a/route.c b/route.c
index 8f1e3bb..743e37d 100644
--- a/route.c
+++ b/route.c
@@ -90,7 +90,7 @@ struct cond_defs cond_defs[] = {
 	  "notbusy=<extension>[,...]","Matches if any of the given extension is not busy."},
 	{ "remote",	MATCH_REMOTE,	COND_TYPE_STRING,
 	  "remote=<application name>","Matches if remote application is running."},
-	{ "notremote",	MATCH_NOTREMOTE,COND_TYPE_NULL,
+	{ "notremote",	MATCH_NOTREMOTE,COND_TYPE_STRING,
 	  "notremote=<application name>","Matches if remote application is not running."},
 	{ NULL, 0, 0, NULL}
 };
@@ -232,8 +232,8 @@ struct param_defs param_defs[] = {
 	  "application",PARAM_TYPE_STRING,
 	  "application=<name>", "Name of remote application to make call to."},
 	{ PARAM_CONTEXT,
-	  "exten",	PARAM_TYPE_STRING,
-	  "exten=<extension>", "Give context parameter to the remote application."},
+	  "context",	PARAM_TYPE_STRING,
+	  "context=<context>", "Give context parameter to the remote application."},
 	{ PARAM_EXTEN,
 	  "exten",	PARAM_TYPE_STRING,
 	  "exten=<extension>", "Give exten parameter to the remote application. (overrides dialed number)"},
@@ -1954,7 +1954,7 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 	struct route_rule	*rule = ruleset->rule_first;
 	struct route_cond	*cond;
 	struct route_action	*action = NULL;
-	unsigned long		comp_len;
+	unsigned int		comp_len;
 	int			j, jj;
 	char			callerid[64],	redirid[64];
 	int			integer;
@@ -2137,9 +2137,9 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 
 				case MATCH_FREE:
 				case MATCH_NOTFREE:
-				if (!(comp_len = (unsigned long)strchr(cond->string_value, ':')))
+				if (!(comp_len = (unsigned int)strchr(cond->string_value, ':')))
 					break;
-				comp_len = comp_len-(unsigned long)cond->string_value;
+				comp_len = comp_len-(unsigned int)cond->string_value;
 				avail = 0;
 				mISDNport = mISDNport_first;
 				while(mISDNport)
@@ -2270,7 +2270,7 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 				match_string_prefix:
 				comp_len = strlen(cond->string_value); /* because we must reach value's length */
 				/* we must have greater or equal length to values */
-				if ((unsigned long)strlen(string) < comp_len)
+				if ((unsigned int)strlen(string) < comp_len)
 				{
 					/* special case for unfinished dialing */
 					if (cond->match == MATCH_DIALING)