Reintroduce raw sockets.

[simgrid.git] / src / gras / Transport / transport.c

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index 252efee..d5d62b4 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -130,14 +130,18 @@ gras_error_t gras_trp_socket_new(int incoming,
 
 
 /**
- * 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;
@@ -152,9 +156,11 @@ gras_socket_server(unsigned short port,
   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',
@@ -169,17 +175,21 @@ gras_socket_server(unsigned short port,
 
   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;
@@ -195,11 +205,11 @@ gras_socket_client(const char *host,
   sock->plugin= trp;
   sock->peer_port = port;
   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',
@@ -215,6 +225,32 @@ gras_socket_client(const char *host,
   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;
@@ -299,3 +335,21 @@ int   gras_socket_peer_port(gras_socket_t *sock) {
 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);   
+}