X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=a287890c4ca20c248c681d79038ad5f378b9d858;hp=4765cff4d45db856334e1e987f9c7ca5366fe6f1;hb=f41688f647116d0a17513cc86c60cc9729da6502;hpb=353e26aabd3849379ee960874d2219d36cc4d62f;ds=inline diff --git a/server.c b/server.c index 4765cff4..a287890c 100644 --- a/server.c +++ b/server.c @@ -484,23 +484,12 @@ repeat: para_fd_set(signal_pipe, &rfds, &max_fileno); timeout = vss_preselect(&rfds, &wfds, &max_fileno); status_refresh(); - for (i = 0; senders[i].name; i++) { - if (!senders[i].pre_select) - continue; - senders[i].pre_select(&max_fileno, &rfds, &wfds); - } mmd_unlock(); ret = para_select(max_fileno + 1, &rfds, &wfds, timeout); mmd_lock(); - vss_post_select(&rfds, &wfds); if (ret < 0) goto repeat; - for (i = 0; senders[i].name; i++) { - if (!senders[i].post_select) - continue; - senders[i].post_select(&rfds, &wfds); - } - vss_send_chunk(); + vss_post_select(&rfds, &wfds); status_refresh(); if (FD_ISSET(signal_pipe, &rfds)) { int sig; @@ -534,14 +523,6 @@ genocide: exit(EXIT_FAILURE); } } - if (mmd->sender_cmd_data.cmd_num >= 0) { - int num = mmd->sender_cmd_data.cmd_num, - s = mmd->sender_cmd_data.sender_num; - - if (senders[s].client_cmds[num]) - senders[s].client_cmds[num](&mmd->sender_cmd_data); - mmd->sender_cmd_data.cmd_num = -1; - } if (!FD_ISSET(sockfd, &rfds)) goto repeat;