X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c42000db0f347a26ac1645d830ac949194ec4da0..6c8aa3e9cb5ce12a2ee632bddac141fa9f0b29b3:/src/gras/Transport/transport_private.h

diff --git a/src/gras/Transport/transport_private.h b/src/gras/Transport/transport_private.h
index 1539170f68..9722dcc190 100644
--- a/src/gras/Transport/transport_private.h
+++ b/src/gras/Transport/transport_private.h
@@ -4,11 +4,10 @@
 
 /* module's private interface masked even to other parts of GRAS.           */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 Martin Quinson.                                       */
+/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
 
 /* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef GRAS_TRP_PRIVATE_H
 #define GRAS_TRP_PRIVATE_H
@@ -19,7 +18,7 @@
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 
-#include "gras/cond.h"       /* gras_if_RL() */
+#include "gras/emul.h"       /* gras_if_RL() */
 
 #include "gras_modinter.h"   /* module init/exit */
 #include "gras/transport.h"  /* rest of module interface */
@@ -34,7 +33,7 @@
  */
 typedef struct gras_trp_bufdata_ gras_trp_bufdata_t;
 
-struct s_gras_socket  {
+typedef struct s_gras_socket  {
   gras_trp_plugin_t *plugin;
     
   int incoming :1; /* true if we can read from this sock */
@@ -53,18 +52,18 @@ struct s_gras_socket  {
 
   /* buffer plugin specific data. Yeah, C is not OO, so I got to trick */
   gras_trp_bufdata_t *bufdata; 
-};
+}s_gras_socket_t;
 	
 void gras_trp_socket_new(int incomming,
-			 gras_socket_t **dst);
+			 gras_socket_t *dst);
 
 /* The drivers */
-typedef gras_error_t (*gras_trp_setup_t)(gras_trp_plugin_t *dst);
+typedef xbt_error_t (*gras_trp_setup_t)(gras_trp_plugin_t *dst);
 
-gras_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug);
-gras_error_t gras_trp_file_setup(gras_trp_plugin_t *plug);
-gras_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug);
-gras_error_t gras_trp_buf_setup(gras_trp_plugin_t *plug);
+xbt_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug);
+xbt_error_t gras_trp_file_setup(gras_trp_plugin_t *plug);
+xbt_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug);
+xbt_error_t gras_trp_buf_setup(gras_trp_plugin_t *plug);
 
 /*
 
@@ -84,14 +83,16 @@ gras_error_t gras_trp_buf_setup(gras_trp_plugin_t *plug);
 
 */
 
-void gras_trp_buf_init_sock(gras_socket_t *sock);
+void gras_trp_buf_init_sock(gras_socket_t sock);
 
 
 /* Data exchange over raw sockets */
-gras_error_t gras_socket_raw_exchange(gras_socket_t *peer,
+xbt_error_t gras_socket_raw_exchange(gras_socket_t peer,
 				      int sender,
 				      unsigned int timeout,
 				      unsigned long int expSize,
 				      unsigned long int msgSize);
 
+xbt_dynar_t gras_socketset_get(void); /* FIXME:KILLME */
+
 #endif /* GRAS_TRP_PRIVATE_H */