X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cefe872c36c945ce02f9c22760966c443e67154a..c102403bfd59375027b5865880814bd2257531c0:/testsuite/gras/trp_tcp_client.c

diff --git a/testsuite/gras/trp_tcp_client.c b/testsuite/gras/trp_tcp_client.c
index 5eb465f39f..bb58f8fa74 100644
--- a/testsuite/gras/trp_tcp_client.c
+++ b/testsuite/gras/trp_tcp_client.c
@@ -2,41 +2,40 @@
 
 /* trp_tcp_client: Client of a test case for the tcp transport.             */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003 the OURAGAN project.                                  */
+/* Copyright (c) 2003, 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. */
 
 #include <stdio.h>
-#include <gras.h>
-#include "../Transport/transport_interface.h"
+#include "gras.h"
+#include "gras/Transport/transport_interface.h"
 
-//GRAS_LOG_NEW_DEFAULT_CATEGORY(test);
+XBT_LOG_NEW_CATEGORY(test,"Logging for this test");
 
 int main(int argc,char *argv[]) {
-  gras_socket_t * sock;
-  gras_error_t errcode;
+  gras_socket_t sock;
   char data_send[256];
   char data_recv[256];
 
   memset(data_send, 0, sizeof(data_send));
   memset(data_recv, 0, sizeof(data_recv));
 
-  gras_init_defaultlog(&argc,argv,"trp.thresh=debug");
+  gras_init(&argc,argv);
 
   fprintf(stderr,"===[CLIENT]=== Contact the server\n");
-  TRYFAIL(gras_socket_client(NULL,55555,&sock));
+  sock = gras_socket_client(NULL,55555);
 
   sprintf(data_send,"Hello, I am a little test data to send.");
   fprintf(stderr,"===[CLIENT]=== Send data\n");
-  TRYFAIL(gras_trp_chunk_send(sock,data_send, sizeof(data_send)));
+  gras_trp_send(sock,data_send, sizeof(data_send),1);
+  gras_trp_flush(sock);
   fprintf(stderr,"===[CLIENT]=== Waiting for the ACK\n");
-  TRYFAIL(gras_trp_chunk_recv(sock,data_recv, sizeof(data_recv)));
+  gras_trp_recv(sock,data_recv, sizeof(data_recv));
   
   if (strcmp(data_send, data_recv)) {
     fprintf(stderr, "===[CLIENT]=== String sent != string received\n");
-    exit(1);
+    xbt_abort();
   } 
   fprintf(stderr,"===[CLIENT]=== Got a valid ACK\n");