From 110bd0fd1e6ee85b32437b6134ee2f50cf75a716 Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 5 Jul 2004 23:18:02 +0000 Subject: [PATCH] use gras_trp_socket_new when accepting instead of mallocing ourself to get all the good initialization from there git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@167 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/Transport/transport_plugin_tcp.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c index 8253035d39..56925046a8 100644 --- a/src/gras/Transport/transport_plugin_tcp.c +++ b/src/gras/Transport/transport_plugin_tcp.c @@ -199,16 +199,15 @@ gras_error_t gras_trp_tcp_socket_accept(gras_socket_t *sock, gras_socket_t **dst) { gras_socket_t *res; + gras_error_t errcode; struct sockaddr_in peer_in; socklen_t peer_in_len = sizeof(peer_in); int sd; int tmp_errno; - - res=malloc(sizeof(gras_socket_t)); - if (!res) - RAISE_MALLOC; + + TRY(gras_trp_socket_new(1,&res)); sd = accept(sock->sd, (struct sockaddr *)&peer_in, &peer_in_len); tmp_errno = errno; @@ -226,13 +225,13 @@ gras_trp_tcp_socket_accept(gras_socket_t *sock, WARN0("setsockopt failed, cannot condition the accepted socket"); } - /* FIXME: bufSize removed until we can have optionsets - i = ((gras_trp_tcp_sock_specific_t*)sock->specific)->buffsize; - if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (char *)&i, s) - || setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (char *)&i, s)) { - WARNING0("setsockopt failed, cannot set buffsize"); - } - */ + /* FIXME: bufSize removed until we can have optionsets + i = ((gras_trp_tcp_sock_specific_t*)sock->specific)->buffsize; + if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (char *)&i, s) + || setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (char *)&i, s)) { + WARNING0("setsockopt failed, cannot set buffsize"); + } + */ res->plugin = sock->plugin; res->incoming = sock->incoming; -- 2.20.1