X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=c1a4fc6af4b72ce20122ef98ec9cf36ce11f1439;hp=d2bd3531cf4069c428e6091fa1d722830e88269e;hb=bf94a866ee741567b4cf8e35d8e6a0565cdfe9bb;hpb=0f6df2322c12b1cc20dea08bb6c397465d4f5b46

diff --git a/http_send.c b/http_send.c
index d2bd3531..c1a4fc6a 100644
--- a/http_send.c
+++ b/http_send.c
@@ -71,7 +71,7 @@ struct http_client {
 	struct chunk_queue *cq;
 };
 
-static int server_fd = -1, numclients;
+static int listen_fd = -1, numclients;
 static struct sender *self;
 
 
@@ -197,6 +197,8 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 	struct http_client *hc, *tmp;
 	const char *err_msg;
 
+	if (listen_fd < 0)
+		return;
 	list_for_each_entry_safe(hc, tmp, &clients, node) {
 		i++;
 //		PARA_DEBUG_LOG("handling client %d: %s\n", i, remote_name(hc->fd));
@@ -235,11 +237,11 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 			break;
 		}
 	}
-	if (!FD_ISSET(server_fd, rfds))
+	if (!FD_ISSET(listen_fd, rfds))
 		return;
 	hc = para_calloc(sizeof(struct http_client));
 	err_msg = "accept error";
-	hc->fd = para_accept(server_fd, NULL, 0);
+	hc->fd = para_accept(listen_fd, NULL, 0);
 	if (hc->fd <= 0)
 		goto err_out;
 	hc->name = make_message("%s", remote_name(hc->fd));
@@ -249,8 +251,8 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 		err_msg = "server full";
 		goto err_out;
 	}
-	match = host_in_acl(hc->fd, &http_acl);
-	PARA_DEBUG_LOG("host_in_acl: %d\n", match);
+	match = acl_lookup(hc->fd, &http_acl);
+	PARA_DEBUG_LOG("acl lookup returned %d\n", match);
 	if ((match && !conf.http_default_deny_given) ||
 			(!match && conf.http_default_deny_given)) {
 		err_msg = "permission denied";
@@ -277,9 +279,9 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 {
 	struct http_client *hc, *tmp;
 
-	if (server_fd < 0)
+	if (listen_fd < 0)
 		return;
-	para_fd_set(server_fd, rfds, max_fileno);
+	para_fd_set(listen_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;
@@ -307,60 +309,56 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 	}
 }
 
-static int open_tcp_port(int port)
+static int http_open(void)
 {
 	int ret;
 
-	server_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, port);
-	if (server_fd < 0) {
-		http_shutdown_clients();
-		self->status = SENDER_OFF;
-		return server_fd;
-	}
-	ret = mark_fd_nonblocking(server_fd);
+	listen_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.http_port_arg);
+	if (listen_fd < 0)
+		return listen_fd;
+	ret = mark_fd_nonblocking(listen_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);
+	add_close_on_fork_list(listen_fd);
 	return 1;
 }
 
 static int http_com_on(__a_unused struct sender_command_data *scd)
 {
-	if (self->status == SENDER_ON)
+	if (listen_fd >= 0)
 		return 1;
-	return open_tcp_port(conf.http_port_arg);
+	return http_open();
 }
 
 static int http_com_off(__a_unused struct sender_command_data *scd)
 {
-	self->status = SENDER_OFF;
-	if (server_fd > 0) {
-		close(server_fd);
-		del_close_on_fork_list(server_fd);
-		server_fd = -1;
-	}
+	if (listen_fd < 0)
+		return 1;
+	PARA_NOTICE_LOG("closing http port %d\n", conf.http_port_arg);
+	close(listen_fd);
+	del_close_on_fork_list(listen_fd);
 	http_shutdown_clients();
+	listen_fd = -1;
 	return 1;
 }
 
 static int http_com_deny(struct sender_command_data *scd)
 {
 	if (conf.http_default_deny_given)
-		del_acl_entry(&http_acl, scd->addr, scd->netmask);
+		acl_del_entry(&http_acl, scd->addr, scd->netmask);
 	else
-		add_acl_entry(&http_acl, scd->addr, scd->netmask);
+		acl_add_entry(&http_acl, scd->addr, scd->netmask);
 	return 1;
 }
 
 static int http_com_allow(struct sender_command_data *scd)
 {
 	if (conf.http_default_deny_given)
-		add_acl_entry(&http_acl, scd->addr, scd->netmask);
+		acl_add_entry(&http_acl, scd->addr, scd->netmask);
 	else
-		del_acl_entry(&http_acl, scd->addr, scd->netmask);
+		acl_del_entry(&http_acl, scd->addr, scd->netmask);
 	return 1;
 }
 
@@ -369,7 +367,7 @@ static char *http_info(void)
 	char *clnts = NULL, *ret;
 	struct http_client *hc, *tmp_hc;
 
-	char *acl_contents = get_acl_contents(&http_acl);
+	char *acl_contents = acl_get_contents(&http_acl);
 	list_for_each_entry_safe(hc, tmp_hc, &clients, node) {
 		char *tmp = make_message("%s%s ", clnts? clnts : "", hc->name);
 		free(clnts);
@@ -382,7 +380,7 @@ static char *http_info(void)
 		"http maximal number of clients: %d%s\n"
 		"http connected clients: %s\n"
 		"http access %s list: %s\n",
-		(self->status == SENDER_ON)? "on" : "off",
+		(listen_fd >= 0)? "on" : "off",
 		conf.http_port_arg,
 		numclients,
 		conf.http_max_clients_arg,
@@ -429,8 +427,8 @@ void http_send_init(struct sender *s)
 	s->client_cmds[SENDER_ADD] = NULL;
 	s->client_cmds[SENDER_DELETE] = NULL;
 	self = s;
-	init_acl(&http_acl, conf.http_access_arg, conf.http_access_given);
+	acl_init(&http_acl, conf.http_access_arg, conf.http_access_given);
 	if (!conf.http_no_autostart_given)
-		open_tcp_port(conf.http_port_arg); /* ignore errors */
+		http_open(); /* ignore errors */
 	PARA_DEBUG_LOG("%s", "http sender init complete\n");
 }