X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=utils.c;h=49f885f02935d270c971045f85e301d2ce6e4df3;hp=ec0b3aa0612d1b3c86f35685b3b2a14047b8ee69;hb=b949545598eaa75b38b4d57c9aea6216bd82256c;hpb=30fff08a44094df9b775f2e4bf9f5abceb847415

diff --git a/utils.c b/utils.c
index ec0b3aa..49f885f 100644
--- a/utils.c
+++ b/utils.c
@@ -99,31 +99,18 @@ int uh_urldecode(char *buf, int blen, const char *src, int slen)
 
 	for (i = 0; (i < slen) && (len < blen); i++)
 	{
-		if (src[i] == '%')
-		{
-			if (((i+2) < slen) && isxdigit(src[i+1]) && isxdigit(src[i+2]))
-			{
-				buf[len++] = (char)(16 * hex(src[i+1]) + hex(src[i+2]));
-				i += 2;
-			}
-			else
-			{
-				/* Encoding error: it's hard to think of a
-				** scenario in which returning an incorrect
-				** 'decoding' of the malformed string is
-				** preferable to signaling an error condition. */
-				#if 0 /* WORSE_IS_BETTER */
-				    buf[len++] = '%';
-				#else
-				    return -2;
-				#endif
-			}
-		}
-		else
-		{
+		if (src[i] != '%') {
 			buf[len++] = src[i];
+			continue;
 		}
+
+		if (i + 2 >= slen || !isxdigit(src[i + 1]) || !isxdigit(src[i + 2]))
+			return -2;
+
+		buf[len++] = (char)(16 * hex(src[i+1]) + hex(src[i+2]));
+		i += 2;
 	}
+	buf[len] = 0;
 
 	return (i == slen) ? len : -1;
 }
@@ -135,7 +122,7 @@ int uh_urlencode(char *buf, int blen, const char *src, int slen)
 {
 	int i;
 	int len = 0;
-	const char hex[] = "0123456789abcdef";
+	static const char hex[] = "0123456789abcdef";
 
 	for (i = 0; (i < slen) && (len < blen); i++)
 	{
@@ -160,18 +147,17 @@ int uh_urlencode(char *buf, int blen, const char *src, int slen)
 	return (i == slen) ? len : -1;
 }
 
-int uh_b64decode(char *buf, int blen, const unsigned char *src, int slen)
+int uh_b64decode(char *buf, int blen, const void *src, int slen)
 {
-	int i = 0;
-	int len = 0;
-
-	unsigned int cin  = 0;
+	const unsigned char *str = src;
 	unsigned int cout = 0;
+	unsigned int cin  = 0;
+	int len = 0;
+	int i = 0;
 
-
-	for (i = 0; (i <= slen) && (src[i] != 0); i++)
+	for (i = 0; (i <= slen) && (str[i] != 0); i++)
 	{
-		cin = src[i];
+		cin = str[i];
 
 		if ((cin >= '0') && (cin <= '9'))
 			cin = cin - '0' + 52;
@@ -190,21 +176,59 @@ int uh_b64decode(char *buf, int blen, const unsigned char *src, int slen)
 
 		cout = (cout << 6) | cin;
 
-		if ((i % 4) == 3)
-		{
-			if ((len + 3) < blen)
-			{
-				buf[len++] = (char)(cout >> 16);
-				buf[len++] = (char)(cout >> 8);
-				buf[len++] = (char)(cout);
-			}
-			else
-			{
-				break;
-			}
-		}
+		if ((i % 4) != 3)
+			continue;
+
+		if ((len + 3) >= blen)
+			break;
+
+		buf[len++] = (char)(cout >> 16);
+		buf[len++] = (char)(cout >> 8);
+		buf[len++] = (char)(cout);
 	}
 
 	buf[len++] = 0;
 	return len;
 }
+
+bool uh_path_match(const char *prefix, const char *url)
+{
+	int len = strlen(prefix);
+
+	if (strncmp(url, prefix, len) != 0)
+		return false;
+
+	return url[len] == '/' || url[len] == 0;
+}
+
+char *uh_split_header(char *str)
+{
+	char *val;
+
+	val = strchr(str, ':');
+	if (!val)
+		return NULL;
+
+	*val = 0;
+	val++;
+
+	while (isspace(*val))
+		val++;
+
+	return val;
+}
+
+bool uh_addr_rfc1918(struct uh_addr *addr)
+{
+	uint32_t a;
+
+	if (addr->family != AF_INET)
+		return false;
+
+	a = htonl(addr->in.s_addr);
+	return ((a >= 0x0A000000) && (a <= 0x0AFFFFFF)) ||
+	       ((a >= 0xAC100000) && (a <= 0xAC1FFFFF)) ||
+	       ((a >= 0xC0A80000) && (a <= 0xC0A8FFFF));
+
+	return 0;
+}