GRAS_LOG_DEFAULT_CATEGORY(transport);
-gras_error_t
-gras_socket_server(unsigned short port,
- unsigned int bufSize,
- /* OUT */ gras_socket_t **dst) {
-
- gras_error_t errcode;
- gras_trp_plugin_t *tcp;
-
- TRY(gras_trp_plugin_get_by_name("TCP",&tcp));
- TRY( tcp->socket_server(tcp, port, bufSize, dst));
-
- (*dst)->incoming = 1;
- (*dst)->accepting = 1;
-
- TRY(gras_dynar_push(_gras_trp_sockets,dst));
-
- return no_error;
-}
-
-gras_error_t
-gras_socket_client(const char *host,
- unsigned short port,
- unsigned int bufSize,
- /* OUT */ gras_socket_t **dst) {
-
- gras_error_t errcode;
- gras_trp_plugin_t *tcp;
-
- TRY(gras_trp_plugin_get_by_name("TCP",&tcp));
- TRY( (*tcp->socket_client)(tcp, host, port, bufSize, dst));
-
- (*dst)->incoming = 0;
- (*dst)->accepting = 0;
-
- return no_error;
-}
-
/**
* gras_trp_select:
gras_socket_t **dst) {
gras_error_t errcode;
+ gras_dynar_t *sockets= gras_socketset_get();
int done = -1;
- double wakeup = gras_time() + 1000000*timeout;
+ double wakeup = gras_os_time() + 1000000*timeout;
double now = 0;
/* nextToService used to make sure socket with high number do not starve */
// static int nextToService = 0;
*dst=NULL;
while (done == -1) {
if (timeout > 0) { /* did we timeout already? */
- now = gras_time();
+ now = gras_os_time();
if (now == -1 || now >= wakeup) {
done = 0; /* didn't find anything */
break;
/* construct the set of socket to ear from */
FD_ZERO(&FDS);
- gras_dynar_foreach(_gras_trp_sockets,cursor,sock_iter) {
- if (max_fds < sock_iter->sd)
- max_fds = sock_iter->sd;
- FD_SET(sock_iter->sd, &FDS);
+ gras_dynar_foreach(sockets,cursor,sock_iter) {
+ if (sock_iter->incoming) {
+ if (max_fds < sock_iter->sd)
+ max_fds = sock_iter->sd;
+ FD_SET(sock_iter->sd, &FDS);
+ } else {
+ DEBUG1("Not considering socket %d for select",sock_iter->sd);
+ }
}
/* we cannot have more than FD_SETSIZE sockets */
if (++max_fds > FD_SETSIZE) {
- WARNING0("too many open sockets.");
+ WARN0("too many open sockets.");
done = 0;
break;
}
p_tout = NULL;
}
+ DEBUG1("Selecting over %d socket(s)", max_fds-1);
ready = select(max_fds, &FDS, NULL, NULL, p_tout);
if (ready == -1) {
switch (errno) {
- case EINTR: /* a signal we don't care about occured. We don't care */
+ case EINTR: /* a signal we don't care about occured. we don't care */
+ /* if we cared, we would have set an handler */
continue;
case EINVAL: /* invalid value */
RAISE3(system_error,"invalid select: nb fds: %d, timeout: %d.%d",
case ENOMEM:
RAISE_MALLOC;
default:
- RAISE2(system_error,"Error during select: %s (%d)",strerror(errno),errno);
+ RAISE2(system_error,"Error during select: %s (%d)",
+ strerror(errno),errno);
}
RAISE_IMPOSSIBLE;
} else if (ready == 0) {
continue; /* this was a timeout */
}
- gras_dynar_foreach(_gras_trp_sockets,cursor,sock_iter) {
+ gras_dynar_foreach(sockets,cursor,sock_iter) {
if(!FD_ISSET(sock_iter->sd, &FDS)) { /* this socket is not ready */
continue;
}
gras_socket_t *accepted;
TRY(sock_iter->plugin->socket_accept(sock_iter,&accepted));
- TRY(gras_dynar_push(_gras_trp_sockets,&accepted));
+ accepted->raw = sock_iter->raw;
} else {
+#if 0
+ FIXME: this fails of files. quite logical
/* Make sure the socket is still alive by reading the first byte */
char lookahead;
int recvd;
recvd = recv(sock_iter->sd, &lookahead, 1, MSG_PEEK);
if (recvd < 0) {
- WARNING2("socket %d failed: %s", sock_iter->sd, strerror(errno));
+ WARN2("socket %d failed: %s", sock_iter->sd, strerror(errno));
/* done with this socket */
- gras_socket_close(sock_iter);
+ gras_socket_close(&sock_iter);
cursor--;
} else if (recvd == 0) {
/* Connection reset (=closed) by peer. */
DEBUG1("Connection %d reset by peer", sock_iter->sd);
- gras_socket_close(sock_iter);
+ gras_socket_close(&sock_iter);
cursor--;
} else {
+#endif
/* Got a suited socket ! */
*dst = sock_iter;
return no_error;
+#if 0
}
+#endif
}
return timeout_error;
}
+
+gras_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) {
+ return mismatch_error;
+}