X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=7be22da07dc9c0cd60c88dcb52c031277e9c33c5;hp=7035f27968f8f90a7d2ce89a3cb77e98130ac632;hb=025bd85e6a7c4618b4741762982b37df35eb7725;hpb=61250cf03241bf73662dac3753e44660a572fa2a diff --git a/http_send.c b/http_send.c index 7035f279..7be22da0 100644 --- a/http_send.c +++ b/http_send.c @@ -286,7 +286,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds) numclients++; para_list_add(&hc->node, &clients); add_close_on_fork_list(hc->fd); - mark_fd_nonblock(hc->fd); + mark_fd_nonblocking(hc->fd); return; err_out: PARA_WARNING_LOG("ignoring connect request from %s (%s)\n", @@ -334,13 +334,13 @@ static int open_tcp_port(int port) { int ret; - server_fd = init_tcp_socket(port); + server_fd = tcp_listen(port); if (server_fd < 0) { http_shutdown_clients(); self->status = SENDER_OFF; return server_fd; } - ret = mark_fd_nonblock(server_fd); + ret = mark_fd_nonblocking(server_fd); if (ret < 0) { PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); exit(EXIT_FAILURE);