X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=f9345acedb0e76ef8ef0487cd24ec411a35ea53f;hp=bb9534cb6bea3a8953a01ad09213994f1d6ade4b;hb=db34194eaab9819772bd55ea1ab08c719ed8f1c8;hpb=a8a78f935dcefa8a7fcda8dae80bca64fe39d632

diff --git a/http_send.c b/http_send.c
index bb9534cb..f9345ace 100644
--- a/http_send.c
+++ b/http_send.c
@@ -29,6 +29,7 @@
 #include "error.h"
 #include "net.h"
 #include "string.h"
+#include "fd.h"
 
 /** \cond convert sock_addr_in to ascii */
 #define CLIENT_ADDR(hc) inet_ntoa((hc)->addr.sin_addr)
@@ -205,7 +206,7 @@ static int send_queued_packets(struct http_client *hc)
 	return 1;
 }
 
-static void http_send(__a_unused struct audio_format *af,
+static void http_send(__a_unused struct audio_format_handler *af,
 		long unsigned current_chunk,
 		__a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
@@ -266,7 +267,7 @@ static int host_in_access_perm_list(struct http_client *hc)
 	return 0;
 }
 
-static void http_post_select(__a_unused struct audio_format *af, fd_set *rfds,
+static void http_post_select(__a_unused struct audio_format_handler *af, fd_set *rfds,
 		fd_set *wfds)
 {
 	int i = -1, match;
@@ -346,16 +347,14 @@ err_out:
 	free(hc);
 }
 
-/* FIXME: use para_fdset */
-static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rfds,
-		fd_set *wfds)
+static void http_pre_select(struct audio_format_handler *af, int *max_fileno,
+	fd_set *rfds, fd_set *wfds)
 {
 	struct http_client *hc, *tmp;
 
 	if (server_fd < 0)
 		return;
-	FD_SET(server_fd, rfds);
-	*max_fileno = PARA_MAX(*max_fileno, server_fd);
+	para_fd_set(server_fd, rfds, max_fileno);
 	list_for_each_entry_safe(hc, tmp, &clients, node) {
 		//PARA_DEBUG_LOG("hc %p on fd %d: status %d\n", hc, hc->fd, hc->status);
 		hc->check_r = 0;
@@ -365,21 +364,18 @@ static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rf
 		case HTTP_READY_TO_STREAM:
 			break;
 		case HTTP_CONNECTED: /* need to recv get request */
-			FD_SET(hc->fd, rfds);
-			*max_fileno = PARA_MAX(*max_fileno, hc->fd);
+			para_fd_set(hc->fd, rfds, max_fileno);
 			hc->check_r = 1;
 			break;
 		case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
 		case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
-			FD_SET(hc->fd, wfds);
-			*max_fileno = PARA_MAX(*max_fileno, hc->fd);
+			para_fd_set(hc->fd, wfds, max_fileno);
 			hc->check_w = 1;
 			break;
 		case HTTP_SENT_OK_MSG:
 			if (!af || !afs_playing())
 				break; /* wait until server starts playing */
-			FD_SET(hc->fd, wfds);
-			*max_fileno = PARA_MAX(*max_fileno, hc->fd);
+			para_fd_set(hc->fd, wfds, max_fileno);
 			hc->check_w = 1;
 			break;
 		}
@@ -565,6 +561,6 @@ void http_send_init(struct sender *s)
 	self = s;
 	init_access_control_list();
 	if (!conf.http_no_autostart_given)
-		open_tcp_port(conf.http_port_arg);
+		open_tcp_port(conf.http_port_arg); /* ignore errors */
 	PARA_DEBUG_LOG("%s", "http sender init complete\n");
 }