X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=424d63b2948c941b2ac28775ec4910b7ec9ff73c;hp=feb1a84233ee67ff03e537c97f14cc0d9abb44e8;hb=9bf4bc297a7cb88f4f886c6b8d600fd6c584139c;hpb=6494f4bfddde1b9e06c4cb8bcd3acf7b9cc762f1

diff --git a/http_send.c b/http_send.c
index feb1a842..424d63b2 100644
--- a/http_send.c
+++ b/http_send.c
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file http_send.c paraslash's http sender */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <osl.h>
@@ -95,23 +96,20 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
 	struct sender_client *sc, *tmp;
 	struct private_http_sender_data *phsd;
+	int ret;
 
-	if (hss->listen_fd < 0)
-		return;
 	list_for_each_entry_safe(sc, tmp, &hss->client_list, node) {
 		phsd = sc->private_data;
 		switch (phsd->status) {
 		case HTTP_STREAMING: /* nothing to do */
 			break;
 		case HTTP_CONNECTED: /* need to recv get request */
-			if (FD_ISSET(sc->fd, rfds)) {
-				if (recv_pattern(sc->fd, HTTP_GET_MSG, MAXLINE)
-						< 0) {
-					phsd->status = HTTP_INVALID_GET_REQUEST;
-				} else {
-					phsd->status = HTTP_GOT_GET_REQUEST;
-					PARA_INFO_LOG("received get request\n");
-				}
+			ret = read_pattern(sc->fd, HTTP_GET_MSG, MAXLINE, rfds);
+			if (ret < 0)
+				phsd->status = HTTP_INVALID_GET_REQUEST;
+			else if (ret > 0) {
+				phsd->status = HTTP_GOT_GET_REQUEST;
+				PARA_INFO_LOG("received get request\n");
 			}
 			break;
 		case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
@@ -124,9 +122,7 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 			break;
 		}
 	}
-	if (!FD_ISSET(hss->listen_fd, rfds))
-		return;
-	sc = accept_sender_client(hss);
+	sc = accept_sender_client(hss, rfds);
 	if (!sc)
 		return;
 	phsd = para_malloc(sizeof(*phsd));
@@ -134,7 +130,7 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 	phsd->status = HTTP_CONNECTED;
 }
 
-static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 {
 	struct sender_client *sc, *tmp;
 
@@ -145,6 +141,9 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wf
 		struct private_http_sender_data *phsd = sc->private_data;
 		if (phsd->status == HTTP_CONNECTED) /* need to recv get request */
 			para_fd_set(sc->fd, rfds, max_fileno);
+		if (phsd->status == HTTP_GOT_GET_REQUEST ||
+				phsd->status == HTTP_INVALID_GET_REQUEST)
+			para_fd_set(sc->fd, wfds, max_fileno);
 	}
 }