X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=c01c6c96e91df812a835fb83b84c0cb2122277f5;hp=f06a5ac258e9a36c88cc9d9dd26acaede6fe2029;hb=843950e7a85730b796bb6238b6e91111f7209c25;hpb=f269333700038603703ec79c909d514bee731faf

diff --git a/http_send.c b/http_send.c
index f06a5ac2..c01c6c96 100644
--- a/http_send.c
+++ b/http_send.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file http_send.c paraslash's http sender */
@@ -22,7 +10,7 @@
 #include "server.cmdline.h"
 #include "server.h"
 #include "http.h"
-#include "afs.h"
+#include "vss.h"
 #include "send.h"
 #include "list.h"
 #include "close_on_fork.h"
@@ -98,7 +86,7 @@ struct access_info {
 	/** the address to be black/whitelisted */
 	struct in_addr addr;
 	/** the netmask for this entry */
-	int netmask;
+	unsigned netmask;
 	/** the position of this entry in the access_perm_list */
 	struct list_head node;
 };
@@ -128,7 +116,7 @@ static void http_shutdown_clients(void)
 {
 	struct http_client *hc, *tmp;
 	list_for_each_entry_safe(hc, tmp, &clients, node)
-		http_shutdown_client(hc, "afs request");
+		http_shutdown_client(hc, "vss request");
 }
 
 static int http_send_msg(struct http_client *hc, const char *msg)
@@ -207,8 +195,8 @@ static void http_send( long unsigned current_chunk,
 				hc->status != HTTP_READY_TO_STREAM)
 			continue;
 		if (hc->status == HTTP_READY_TO_STREAM) {
-			int hlen;
-			char *hbuf = afs_get_header(&hlen);
+			unsigned hlen;
+			char *hbuf = vss_get_header(&hlen);
 			if (hbuf && hlen > 0 && current_chunk) {
 				/* need to send header */
 				PARA_INFO_LOG("queueing header: %d\n", hlen);
@@ -247,7 +235,7 @@ static int host_in_access_perm_list(struct http_client *hc)
 {
 	struct access_info *ai, *tmp;
 	list_for_each_entry_safe(ai, tmp, &access_perm_list, node) {
-		unsigned mask = ((~0) >> ai->netmask);
+		unsigned mask = ((~0U) >> ai->netmask);
 		if ((hc->addr.sin_addr.s_addr & mask) == (ai->addr.s_addr & mask))
 			return 1;
 	}
@@ -360,7 +348,7 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 			hc->check_w = 1;
 			break;
 		case HTTP_SENT_OK_MSG:
-			if (!afs_playing())
+			if (!vss_playing())
 				break; /* wait until server starts playing */
 			para_fd_set(hc->fd, wfds, max_fileno);
 			hc->check_w = 1;