X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=97b4d919e4d3c6047bcb4283002dccf1e932150c;hp=5eebba5612bd845190bc573fe3d73895e7c60c50;hb=2bca38fbb97e6c5371591eb754b79cc12525aba0;hpb=3f17a6b0fb4dc1687fb722d0e6033ed26c46c6fd

diff --git a/http_send.c b/http_send.c
index 5eebba56..97b4d919 100644
--- a/http_send.c
+++ b/http_send.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -22,7 +22,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"
@@ -38,8 +38,6 @@
 #define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n"
 /** \endcond */
 
-extern struct gengetopt_args_info conf;
-
 /** the possible states of a client from the server's POV */
 enum http_status {
 	HTTP_CONNECTED,
@@ -100,7 +98,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;
 };
@@ -130,7 +128,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)
@@ -209,12 +207,12 @@ 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 *buf = afs_get_header(&hlen);
-			if (buf && hlen > 0 && current_chunk) {
+			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);
-				if (queue_packet(hc, buf, hlen) < 0)
+				if (queue_packet(hc, hbuf, hlen) < 0)
 					continue;
 			} else
 				PARA_INFO_LOG("%s", "no need to queue header\n");
@@ -249,7 +247,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;
 	}
@@ -325,7 +323,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 	PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
 		CLIENT_ADDR(hc), hc->fd);
 	numclients++;
-	list_add(&hc->node, &clients);
+	para_list_add(&hc->node, &clients);
 	add_close_on_fork_list(hc->fd);
 	mark_fd_nonblock(hc->fd);
 	return;
@@ -362,7 +360,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;
@@ -373,12 +371,19 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 
 static int open_tcp_port(int port)
 {
+	int ret;
+
 	server_fd = init_tcp_socket(port);
 	if (server_fd < 0) {
 		http_shutdown_clients();
 		self->status = SENDER_OFF;
 		return server_fd;
 	}
+	ret = mark_fd_nonblock(server_fd);
+	if (ret < 0) {
+		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+		exit(EXIT_FAILURE);
+	}
 	self->status = SENDER_ON;
 	add_close_on_fork_list(server_fd);
 	return 1;
@@ -427,7 +432,7 @@ static void add_perm_list_entry(struct sender_command_data *scd)
 	ai->netmask = scd->netmask;
 	PARA_INFO_LOG("adding %s/%i to access list\n", inet_ntoa(ai->addr),
 		ai->netmask);
-	list_add(&ai->node, &access_perm_list);
+	para_list_add(&ai->node, &access_perm_list);
 }
 
 static int http_com_deny(struct sender_command_data *scd)