X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=route.c;h=29381c2d2a339f93d4cb2bdba38f494024c5277a;hp=743e37de5ce9921f3dbe8644becf17b53c4a2367;hb=ee848d3a9e333b3b91c0e40679c9d0512d511fc2;hpb=e602f7bfbdf28bd72d89af6ffa4e6f7dad02ff03

diff --git a/route.c b/route.c
index 743e37d..29381c2 100644
--- a/route.c
+++ b/route.c
@@ -751,7 +751,7 @@ void ruleset_debug(struct route_ruleset *ruleset_start)
 /*
  * parse ruleset
  */
-static char *read_string(char *p, char *key, int key_size, char *special)
+static char *read_string(char *p, char *key, int key_size, const char *special)
 {
 	key[0] = 0;
 
@@ -875,7 +875,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 +943,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]);
@@ -1922,7 +1922,7 @@ struct route_ruleset *ruleset_parse(void)
 /*
  * return ruleset by name
  */
-struct route_ruleset *getrulesetbyname(char *name)
+struct route_ruleset *getrulesetbyname(const char *name)
 {
 	struct route_ruleset *ruleset = ruleset_first;
 
@@ -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 int		comp_len;
+	unsigned long		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 int)strchr(cond->string_value, ':')))
+				if (!(comp_len = (unsigned long)strchr(cond->string_value, ':')))
 					break;
-				comp_len = comp_len-(unsigned int)cond->string_value;
+				comp_len = comp_len-(unsigned long)cond->string_value;
 				avail = 0;
 				mISDNport = mISDNport_first;
 				while(mISDNport)
@@ -2147,7 +2147,7 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 					if (mISDNport->ifport)
 					if (strlen(mISDNport->ifport->interface->name) == comp_len)
 					if (!strncasecmp(mISDNport->ifport->interface->name, cond->string_value, comp_len)) 
-					if (!mISDNport->l2hold || mISDNport->l2link)
+					if (!mISDNport->l2hold || mISDNport->l2link>0)
 					{
 						j = 0;
 						jj = mISDNport->b_num;
@@ -2179,7 +2179,7 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 				{
 					if (mISDNport->ifport)
 					if (!strcasecmp(mISDNport->ifport->interface->name, cond->string_value)) 
-					if (!mISDNport->l2hold || mISDNport->l2link)
+					if (!mISDNport->l2hold || mISDNport->l2link>0)
 						break;
 					mISDNport = mISDNport->next;
 				}
@@ -2193,7 +2193,7 @@ struct route_action *EndpointAppPBX::route(struct route_ruleset *ruleset)
 				{
 					if (mISDNport->ifport)
 					if (!strcasecmp(mISDNport->ifport->interface->name, cond->string_value)) 
-					if (!mISDNport->l2hold || mISDNport->l2link)
+					if (!mISDNport->l2hold || mISDNport->l2link>0)
 						break;
 					
 					mISDNport = mISDNport->next;
@@ -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 int)strlen(string) < comp_len)
+				if ((unsigned long)strlen(string) < comp_len)
 				{
 					/* special case for unfinished dialing */
 					if (cond->match == MATCH_DIALING)