X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=utils.c;h=1c21fc56eaddc555aac290000042ed2731411c4a;hp=d2ad296bcfe7f59bfc24c7d89fbe8bff8c68cac7;hb=b965b8cc10f094ec0408d57b1bc9aeee0bca501c;hpb=d0aab7b1fc7c94c3d6d41990e7615be85b58e640

diff --git a/utils.c b/utils.c
index d2ad296..1c21fc5 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>
@@ -25,7 +25,7 @@ bool uh_use_chunked(struct client *cl)
 	if (cl->request.version != UH_HTTP_VER_1_1)
 		return false;
 
-	if (cl->request.method == UH_HTTP_MSG_HEAD)
+	if (cl->request.method == UH_HTTP_MSG_HEAD || cl->request.method == UH_HTTP_MSG_OPTIONS)
 		return false;
 
 	return true;
@@ -35,6 +35,9 @@ void uh_chunk_write(struct client *cl, const void *data, int len)
 {
 	bool chunked = uh_use_chunked(cl);
 
+	if (cl->state == CLIENT_STATE_CLEANUP)
+		return;
+
 	uloop_timeout_set(&cl->timeout, conf.network_timeout * 1000);
 	if (chunked)
 		ustream_printf(cl->us, "%X\r\n", len);
@@ -49,6 +52,9 @@ void uh_chunk_vprintf(struct client *cl, const char *format, va_list arg)
 	va_list arg2;
 	int len;
 
+	if (cl->state == CLIENT_STATE_CLEANUP)
+		return;
+
 	uloop_timeout_set(&cl->timeout, conf.network_timeout * 1000);
 	if (!uh_use_chunked(cl)) {
 		ustream_vprintf(cl->us, format, arg);
@@ -81,6 +87,9 @@ void uh_chunk_eof(struct client *cl)
 	if (!uh_use_chunked(cl))
 		return;
 
+	if (cl->state == CLIENT_STATE_CLEANUP)
+		return;
+
 	ustream_printf(cl->us, "0\r\n\r\n");
 }
 
@@ -122,7 +131,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++)
 	{
@@ -217,3 +226,18 @@ char *uh_split_header(char *str)
 
 	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;
+}