#include "xbt/ex.h"
#include "transport_private.h"
+/* FIXME maybe READV is sometime a good thing? */
#undef HAVE_READV
#ifdef HAVE_READV
#define MIN(a,b) ((a)<(b)?(a):(b))
#endif
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_tcp,transport,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_tcp,gras_trp,
"TCP buffered transport");
/***
/*****************************/
/****[ SOCKET MANAGEMENT ]****/
/*****************************/
+/* we exchange port number on client side on socket creation,
+ so we need to be able to talk right now. */
+static inline void gras_trp_tcp_send(gras_socket_t sock, const char *data,
+ unsigned long int size);
+static int gras_trp_tcp_recv(gras_socket_t sock, char *data,
+ unsigned long int size);
+
+
static int _gras_tcp_proto_number(void);
static inline void gras_trp_sock_socket_client(gras_trp_plugin_t ignored,
struct hostent *he;
struct in_addr *haddr;
int size = sock->buf_size;
+ uint32_t myport = htonl(((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport);
sock->incoming = 1; /* TCP sockets are duplex'ed */
"Failed to connect socket to %s:%d (%s)",
sock->peer_name, sock->peer_port, sock_errstr);
}
+
+ gras_trp_tcp_send(sock,(char*)&myport,sizeof(uint32_t));
+ DEBUG1("peerport sent to %d", sock->peer_port);
+
VERB4("Connect to %s:%d (sd=%d, port %d here)",
sock->peer_name, sock->peer_port, sock->sd, sock->port);
}
int i = 1;
socklen_t s = sizeof(int);
+
+ uint32_t hisport;
XBT_IN;
gras_trp_socket_new(1,&res);
res->accepting = 0;
res->sd = sd;
res->port = -1;
- res->peer_port = peer_in.sin_port;
+
+ gras_trp_tcp_recv(res,(char*)&hisport,sizeof(hisport));
+ res->peer_port = ntohl(hisport);
+ DEBUG1("peerport %d received",res->peer_port);
/* FIXME: Lock to protect inet_ntoa */
if (((struct sockaddr *)&peer_in)->sa_family != AF_INET) {
DEBUG3("write(%d, %p, %ld);", sock->sd, data, size);
if (status < 0) {
+#ifdef EWOULDBLOCK
+ if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
+#else
+ if (errno == EINTR || errno == EAGAIN)
+#endif
+ continue;
+
THROW4(system_error,0,"write(%d,%p,%ld) failed: %s",
sock->sd, data, size,
sock_errstr);
status = tcp_read(sock->sd, data+got, (size_t)bufsize);
if (status < 0) {
- THROW4(system_error,0,"read(%d,%p,%d) failed: %s",
+ THROW7(system_error,0,"read(%d,%p,%d) from %s:%d failed: %s; got %d so far",
sock->sd, data+got, (int)size,
- sock_errstr);
+ gras_socket_peer_name(sock),gras_socket_peer_port(sock),
+ sock_errstr,
+ got);
}
DEBUG2("Got %d more bytes (%s)",status,hexa_str((unsigned char*)data+got,status));
bufsize -= status;
got += status;
} else {
- THROW0(system_error,0,"Socket closed by remote side");
+ THROW1(system_error,0,"Socket closed by remote side (got %d bytes before this)",
+ got);
}
}
+ /* indicate to the gras_select function that there is more to read on this socket so that it does not actually select */
+ sock->moredata = (bufsize != 0);
return got;
}
DEBUG0("Flush");
if (data->out == buffering_buf) {
- if (XBT_LOG_ISENABLED(trp_tcp,xbt_log_priority_debug))
+ if (XBT_LOG_ISENABLED(gras_trp_tcp,xbt_log_priority_debug))
hexa_print("chunk to send ",
(unsigned char *) data->out_buf.data,data->out_buf.size);
if ((data->out_buf.size - data->out_buf.pos) != 0) {