/* This program is free software; you can redistribute it and/or modify it
under the terms of the license (GNU LGPL) which comes with this package. */
-#include <time.h> /* time() */
+#include "gras/Transport/transport_private.h"
-#include "Transport/transport_private.h"
-
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(transport,GRAS);
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(transport,gras,"Conveying bytes over the network");
static gras_dict_t *_gras_trp_plugins; /* All registered plugins */
static void gras_trp_plugin_free(void *p); /* free one of the plugins */
gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
gras_error_t errcode;
- gras_trp_plugin_t *plug = malloc(sizeof(gras_trp_plugin_t));
+ gras_trp_plugin_t *plug = gras_new0(gras_trp_plugin_t, 1);
DEBUG1("Create plugin %s",name);
if (!plug)
RAISE_MALLOC;
- memset(plug,0,sizeof(gras_trp_plugin_t));
-
- plug->name=strdup(name);
+ plug->name=(char*)strdup(name);
if (!plug->name)
RAISE_MALLOC;
switch (errcode) {
case mismatch_error:
/* SG plugin return mismatch when in RL mode (and vice versa) */
- free(plug->name);
- free(plug);
+ gras_free(plug->name);
+ gras_free(plug);
break;
case no_error:
break;
default:
- free(plug);
+ gras_free(plug);
return errcode;
}
return no_error;
TRY(gras_trp_plugin_new("file",gras_trp_file_setup));
TRY(gras_trp_plugin_new("sg",gras_trp_sg_setup));
+ /* buf is composed, so it must come after the others */
+ TRY(gras_trp_plugin_new("buf", gras_trp_buf_setup));
+
return no_error;
}
plug->exit(plug);
} else if (plug->data) {
DEBUG1("Plugin %s lacks exit(). Free data anyway.",plug->name);
- free(plug->data);
+ gras_free(plug->data);
}
- free(plug->name);
- free(plug);
+ gras_free(plug->name);
+ gras_free(plug);
}
}
gras_socket_t *sock;
- if (! (sock=malloc(sizeof(gras_socket_t))) )
+ if (! (sock=gras_new(gras_socket_t,1)) )
RAISE_MALLOC;
+ DEBUG1("Create a new socket (%p)", (void*)sock);
sock->plugin = NULL;
sock->sd = -1;
+ sock->data = NULL;
sock->incoming = incoming ? 1:0;
sock->outgoing = incoming ? 0:1;
/**
- * gras_socket_server:
+ * gras_socket_server_ext:
*
* Opens a server socket and make it ready to be listened to.
* In real life, you'll get a TCP socket.
*/
gras_error_t
-gras_socket_server(unsigned short port,
- /* OUT */ gras_socket_t **dst) {
+gras_socket_server_ext(unsigned short port,
+
+ unsigned long int bufSize,
+ int raw,
+
+ /* OUT */ gras_socket_t **dst) {
gras_error_t errcode;
gras_trp_plugin_t *trp;
*dst = NULL;
DEBUG1("Create a server socket from plugin %s",gras_if_RL() ? "tcp" : "sg");
- TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "tcp" : "sg",
- &trp));
+ TRY(gras_trp_plugin_get_by_name("buf",&trp));
/* defaults settings */
TRY(gras_trp_socket_new(1,&sock));
sock->plugin= trp;
sock->port=port;
+ sock->bufSize = bufSize;
+ sock->raw = raw;
/* Call plugin socket creation function */
- errcode = trp->socket_server(trp, port, sock);
+ errcode = trp->socket_server(trp, sock);
DEBUG3("in=%c out=%c accept=%c",
sock->incoming?'y':'n',
sock->outgoing?'y':'n',
sock->accepting?'y':'n');
if (errcode != no_error) {
- free(sock);
+ gras_free(sock);
return errcode;
}
return no_error;
}
-
+
/**
- * gras_socket_client:
+ * gras_socket_client_ext:
*
* Opens a client socket to a remote host.
* In real life, you'll get a TCP socket.
*/
gras_error_t
-gras_socket_client(const char *host,
- unsigned short port,
- /* OUT */ gras_socket_t **dst) {
+gras_socket_client_ext(const char *host,
+ unsigned short port,
+
+ unsigned long int bufSize,
+ int raw,
+
+ /* OUT */ gras_socket_t **dst) {
gras_error_t errcode;
gras_trp_plugin_t *trp;
*dst = NULL;
- TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "tcp" : "sg",
- &trp));
+ TRY(gras_trp_plugin_get_by_name("buf",&trp));
+ DEBUG1("Create a client socket from plugin %s",gras_if_RL() ? "tcp" : "sg");
/* defaults settings */
TRY(gras_trp_socket_new(0,&sock));
sock->plugin= trp;
sock->peer_port = port;
- sock->peer_name = strdup(host?host:"localhost");
+ sock->peer_name = (char*)strdup(host?host:"localhost");
+ sock->bufSize = bufSize;
+ sock->raw = raw;
/* plugin-specific */
- errcode= (* trp->socket_client)(trp,
- host ? host : "localhost", port,
- sock);
+ errcode= (*trp->socket_client)(trp, sock);
DEBUG3("in=%c out=%c accept=%c",
sock->incoming?'y':'n',
sock->outgoing?'y':'n',
sock->accepting?'y':'n');
if (errcode != no_error) {
- free(sock);
+ gras_free(sock);
return errcode;
}
return no_error;
}
+/**
+ * gras_socket_server:
+ *
+ * Opens a server socket and make it ready to be listened to.
+ * In real life, you'll get a TCP socket.
+ */
+gras_error_t
+gras_socket_server(unsigned short port,
+ /* OUT */ gras_socket_t **dst) {
+ return gras_socket_server_ext(port,32,0,dst);
+}
+
+/**
+ * gras_socket_client:
+ *
+ * Opens a client socket to a remote host.
+ * In real life, you'll get a TCP socket.
+ */
+gras_error_t
+gras_socket_client(const char *host,
+ unsigned short port,
+ /* OUT */ gras_socket_t **dst) {
+ return gras_socket_client_ext(host,port,32,0,dst);
+}
+
+
void gras_socket_close(gras_socket_t *sock) {
gras_dynar_t *sockets = gras_socketset_get();
gras_socket_t *sock_iter;
/* free the memory */
if (sock->peer_name)
- free(sock->peer_name);
- free(sock);
+ gras_free(sock->peer_name);
+ gras_free(sock);
return;
}
}
gras_error_t
gras_trp_chunk_send(gras_socket_t *sd,
char *data,
- size_t size) {
+ long int size) {
gras_assert1(sd->outgoing,
"Socket not suited for data send (outgoing=%c)",
sd->outgoing?'y':'n');
gras_error_t
gras_trp_chunk_recv(gras_socket_t *sd,
char *data,
- size_t size) {
+ long int size) {
gras_assert0(sd->incoming,
"Socket not suited for data receive");
gras_assert1(sd->plugin->chunk_recv,
return (sd->plugin->chunk_recv)(sd,data,size);
}
+/**
+ * gras_trp_flush:
+ *
+ * Make sure all pending communications are done
+ */
+gras_error_t
+gras_trp_flush(gras_socket_t *sd) {
+ return (sd->plugin->flush)(sd);
+}
gras_error_t
gras_trp_plugin_get_by_name(const char *name,
char *gras_socket_peer_name(gras_socket_t *sock) {
return sock->peer_name;
}
+
+gras_error_t gras_socket_raw_send(gras_socket_t *peer,
+ unsigned int timeout,
+ unsigned long int expSize,
+ unsigned long int msgSize) {
+
+ gras_assert0(peer->raw,"Asked to send raw data on a regular socket\n");
+ return gras_socket_raw_exchange(peer,1,timeout,expSize,msgSize);
+}
+
+gras_error_t gras_socket_raw_recv(gras_socket_t *peer,
+ unsigned int timeout,
+ unsigned long int expSize,
+ unsigned long int msgSize){
+
+ gras_assert0(peer->raw,"Asked to recveive raw data on a regular socket\n");
+ return gras_socket_raw_exchange(peer,0,timeout,expSize,msgSize);
+}
