X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=utils.c;h=3b868e3576805126a05283c9ce38ee60c407988c;hp=477296f4279e70da913d45a3f219ece094f0865d;hb=7dea5d994ea8c1b753b734edb27fdaf7c948c326;hpb=46cf4c79368daa556ed6936999ab05408f61da00

diff --git a/utils.c b/utils.c
index 477296f..3b868e3 100644
--- a/utils.c
+++ b/utils.c
@@ -1,20 +1,20 @@
 /*
  * uhttpd - Tiny single-threaded httpd
  *
- *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- *   Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <ctype.h>
@@ -122,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++)
 	{
@@ -147,16 +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)
 {
+	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;
@@ -199,3 +200,35 @@ bool uh_path_match(const char *prefix, const char *url)
 
 	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;
+}