client_common.c: Kill invalid FIXME.
[paraslash.git] / client_common.c
index 4266ddb..b9d61c5 100644 (file)
@@ -76,26 +76,17 @@ void client_close(struct private_client_data *pcd)
        free(pcd);
 }
 
+/* connect to para_server and register the client task */
 static int client_connect(struct private_client_data *pcd)
 {
        int ret;
-       struct hostent *he;
-       struct sockaddr_in their_addr;
 
        pcd->fd = -1;
-       ret = get_host_info(pcd->conf.hostname_arg, &he);
-       if (ret < 0)
-               return ret;
-       /* get new socket */
-       ret = get_stream_socket(AF_INET);
+       ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, pcd->conf.hostname_arg,
+                                                 pcd->conf.server_port_arg);
        if (ret < 0)
                return ret;
        pcd->fd = ret;
-       /* init their_addr */
-       init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
-       ret = PARA_CONNECT(pcd->fd, &their_addr);
-       if (ret < 0)
-               goto err_out;
        pcd->status = CL_CONNECTED;
        ret = mark_fd_nonblocking(pcd->fd);
        if (ret < 0)
@@ -234,8 +225,8 @@ void client_pre_select(struct sched *s, struct task *t)
                        para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
                        pcd->check_w = 1;
                } else {
-                       if (*pcd->in_eof) {
-                               t->ret = -E_INPUT_EOF;
+                       if (*pcd->in_error) {
+                               t->ret = *pcd->in_error;
                                s->timeout.tv_sec = 0;
                                s->timeout.tv_usec = 1;
                        }
@@ -384,7 +375,7 @@ void client_post_select(struct sched *s, struct task *t)
                t->ret = send_bin_buffer(pcd->fd, pcd->inbuf, *pcd->in_loaded);
                if (t->ret < 0)
                        return;
-               *pcd->in_loaded = 0; /* FIXME: short writes */
+               *pcd->in_loaded = 0;
                return;
        case CL_RECEIVING:
                t->ret = client_recv_buffer(pcd);