X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e2c10f61cfd4d58faa73f006aa74def2c73c8860..a3570625c9460617ccad1803b50bc4f1793b6376:/include/gras/transport.h

diff --git a/include/gras/transport.h b/include/gras/transport.h
index 57da3b9323..ae9b126792 100644
--- a/include/gras/transport.h
+++ b/include/gras/transport.h
@@ -26,7 +26,7 @@
  * If you need an example of how to use sockets, check \ref GRAS_ex_ping.
  *
  */
- 
+
 /** \defgroup GRAS_sock_create Socket creation functions
  *  \ingroup GRAS_sock
  *
@@ -36,41 +36,56 @@
 typedef struct s_gras_socket *gras_socket_t;
 
 /** \brief Simply create a client socket (to speak to a remote host) */
-XBT_PUBLIC gras_socket_t gras_socket_client(const char *host, unsigned short port);
-XBT_PUBLIC gras_socket_t gras_socket_client_from_string(const char *host);
+XBT_PUBLIC(gras_socket_t) gras_socket_client(const char *host,
+                                             unsigned short port);
+XBT_PUBLIC(gras_socket_t) gras_socket_client_from_string(const char *host);
 /** \brief Simply create a server socket (to ear from remote hosts speaking to you) */
-XBT_PUBLIC gras_socket_t gras_socket_server(unsigned short port);
-XBT_PUBLIC void          gras_socket_close(gras_socket_t sd);
+XBT_PUBLIC(gras_socket_t) gras_socket_server(unsigned short port);
+XBT_PUBLIC(void) gras_socket_close(gras_socket_t sd);
+XBT_PUBLIC(void) gras_socket_close_voidp(void *sock);
 
 /** \brief Create a client socket, full interface to all relevant settings */
-XBT_PUBLIC gras_socket_t gras_socket_client_ext(const char *host,
-				     unsigned short port,
-				     unsigned long int bufSize,
-				     int measurement);
+XBT_PUBLIC(gras_socket_t) gras_socket_client_ext(const char *host,
+                                                 unsigned short port,
+                                                 unsigned long int bufSize,
+                                                 int measurement);
 /** \brief Create a server socket, full interface to all relevant settings */
-XBT_PUBLIC gras_socket_t gras_socket_server_ext(unsigned short port,
-				     unsigned long int bufSize,
-				     int measurement);
-XBT_PUBLIC gras_socket_t
-gras_socket_server_range(unsigned short minport, unsigned short maxport,
-			 unsigned long int buf_size, int measurement);
+XBT_PUBLIC(gras_socket_t) gras_socket_server_ext(unsigned short port,
+                                                 unsigned long int bufSize,
+                                                 int measurement);
+XBT_PUBLIC(gras_socket_t)
+  gras_socket_server_range(unsigned short minport, unsigned short maxport,
+                         unsigned long int buf_size, int measurement);
 
 /* @}*/
 /** \defgroup GRAS_sock_info Retrieving data about sockets and peers 
  *  \ingroup GRAS_sock
  * 
- * Who are you talking to?
+ * Who are you talking to? 
  */
 /* @{*/
 
 /** Get the port number on which this socket is connected on my side */
-XBT_PUBLIC int   gras_socket_my_port  (gras_socket_t sock);
-/** Get the port number on which this socket is connected on remote side */
-XBT_PUBLIC int   gras_socket_peer_port(gras_socket_t sock);
+XBT_PUBLIC(int) gras_socket_my_port(gras_socket_t sock);
+/** @brief Get the port number on which this socket is connected on remote side 
+ *
+ * This is the port declared on remote side with the
+ * gras_socket_master() function (if any, or a random number being uniq on 
+ * the remote host). If remote used gras_socket_master() more than once, the 
+ * lastly declared number will be used here.
+ *
+ * Note to BSD sockets experts: With BSD sockets, the sockaddr 
+ * structure allows you to retrieve the port of the client socket on
+ * remote side, but it is of no use (from user perspective, it is
+ * some random number above 6000). That is why GRAS sockets differ
+ * from BSD ones here. 
+ */
+
+XBT_PUBLIC(int) gras_socket_peer_port(gras_socket_t sock);
 /** Get the host name of the remote side */
-XBT_PUBLIC char *gras_socket_peer_name(gras_socket_t sock);
+XBT_PUBLIC(char *) gras_socket_peer_name(gras_socket_t sock);
 /** Get the process name of the remote side */
-XBT_PUBLIC char *gras_socket_peer_proc(gras_socket_t sock);
+XBT_PUBLIC(char *) gras_socket_peer_proc(gras_socket_t sock);
 /* @}*/
 
 /** \defgroup GRAS_sock_meas Using measurement sockets
@@ -86,17 +101,17 @@ XBT_PUBLIC char *gras_socket_peer_proc(gras_socket_t sock);
 
 
 
-XBT_PUBLIC int gras_socket_is_meas(gras_socket_t sock);
-XBT_PUBLIC void gras_socket_meas_send(gras_socket_t peer, 
-			   unsigned int timeout,
-			   unsigned long int expSize, 
-			   unsigned long int msgSize);
-XBT_PUBLIC void gras_socket_meas_recv(gras_socket_t peer, 
-			   unsigned int timeout,
-			   unsigned long int expSize, 
-			   unsigned long int msgSize);
-XBT_PUBLIC gras_socket_t gras_socket_meas_accept(gras_socket_t peer);
-            
+XBT_PUBLIC(int) gras_socket_is_meas(gras_socket_t sock);
+XBT_PUBLIC(void) gras_socket_meas_send(gras_socket_t peer,
+                                       unsigned int timeout,
+                                       unsigned long int msgSize,
+                                       unsigned long int msgAmount);
+XBT_PUBLIC(void) gras_socket_meas_recv(gras_socket_t peer,
+                                       unsigned int timeout,
+                                       unsigned long int msgSize,
+                                       unsigned long int msgAmount);
+XBT_PUBLIC(gras_socket_t) gras_socket_meas_accept(gras_socket_t peer);
+
 /* @}*/
 
 /** \defgroup GRAS_sock_file Using files as sockets
@@ -111,9 +126,9 @@ XBT_PUBLIC gras_socket_t gras_socket_meas_accept(gras_socket_t peer);
  */
 /* @{*/
 /* debuging functions */
-XBT_PUBLIC gras_socket_t gras_socket_client_from_file(const char*path);
-XBT_PUBLIC gras_socket_t gras_socket_server_from_file(const char*path);
-					  
+XBT_PUBLIC(gras_socket_t) gras_socket_client_from_file(const char *path);
+XBT_PUBLIC(gras_socket_t) gras_socket_server_from_file(const char *path);
+
 /* @} */
-   
+
 #endif /* GRAS_TRANSPORT_H */