X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=7c93b91722649a2a5386db892d444702025b07bd;hp=1b53f705423556040736a4e70dbd8fc7460a38f2;hb=60f9b7e82c73870d0fd3c09b5fe1fb61aa38dfd7;hpb=8dffec19598a4a0ed77fa082abaf52c8fe66d889 diff --git a/client_common.c b/client_common.c index 1b53f705..7c93b917 100644 --- a/client_common.c +++ b/client_common.c @@ -6,7 +6,11 @@ /** \file client_common.c common functions of para_client and para_audiod */ +#include +#include + #include "para.h" +#include "error.h" #include "list.h" #include "sched.h" #include "client.cmdline.h" @@ -17,7 +21,6 @@ #include "string.h" #include "client.cmdline.h" #include "client.h" -#include "error.h" /* * rc4 encrypt data before sending @@ -84,13 +87,13 @@ static int client_connect(struct private_client_data *pcd) if (ret < 0) return ret; /* get new socket */ - ret = get_socket(); + ret = get_stream_socket(AF_INET); 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); + ret = PARA_CONNECT(pcd->fd, &their_addr); if (ret < 0) goto err_out; pcd->status = CL_CONNECTED;