better error messages

diff --git a/org.glite.testsuites.ctb/LB/testSocket.c b/org.glite.testsuites.ctb/LB/testSocket.c
index ae8b558..d4f00b4 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/testSocket.c
+++ b/org.glite.testsuites.ctb/LB/testSocket.c
@@ -9,18 +9,11 @@
 #include <unistd.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <errno.h>
 
 #define BUFFSIZE 32
-void
-Die (char *mess)
-{
-  perror (mess);
-  exit (1);
-}
 
-int
-main (int argc, char *argv[])
-{
+int main (int argc, char *argv[]) {
   int sock;
   struct hostent *hip;
   char *adrIPp;
@@ -29,40 +22,35 @@ main (int argc, char *argv[])
   char buffer[BUFFSIZE];
   unsigned int echolen;
   int received = 0;
-  if (argc != 3)
-    {
-      fprintf (stderr, "USAGE: TCPecho <server_ip> <port>\n");
-      exit (1);
-    }
-//conversion from DNS to IPv4
-  if ((hip = gethostbyname (argv[1])) == NULL)
-    {
-      printf ("Erreur avec gethostbyname\n");
-//           exit(1);
-    }
+  if (argc != 3) {
+      fprintf(stderr, "USAGE: TCPecho <server_ip> <port>\n");
+      exit(1);
+  }
+/* conversion from DNS to IPv4 */
+  if ((hip = gethostbyname (argv[1])) == NULL) {
+      fprintf(stderr,"Error with gethostbyname: %s",strerror(errno));
+//      exit(1);
+  }
   adrIP.s_addr = *(int *) hip->h_addr;
   adrIPp = (char *) inet_ntoa (adrIP);
 /* Create the TCP socket */
-  if ((sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
-    {
-      Die ("Failed to create socket");
-    }
+  if ((sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
+      fprintf(stderr,"Failed to create socket: %s",strerror(errno));
+      exit(1);
+  }
 /* Construct the server sockaddr_in structure */
   memset (&echoserver, 0, sizeof (echoserver));        /* Clear struct */
   echoserver.sin_family = AF_INET;     /* Internet/IP */
   echoserver.sin_addr.s_addr = inet_addr (adrIPp);     /* IP address */
   echoserver.sin_port = htons (atoi (argv[2]));        /* server port */
-//  printf ("Connecting to: %s:%s\n", adrIPp, argv[2]);
+//  fprintf(stdout,"Connecting to: %s:%s\n", adrIPp, argv[2]);
 /* Establish connection */
-  if (connect (sock,
-              (struct sockaddr *) &echoserver, sizeof (echoserver)) < 0)
-    {
-      Die ("Failed to connect with server");
-    }
-  else
-    {
-      shutdown (sock, 2);
-//      printf (" [OK]\n");
-      exit (0);
-    }
+  if (connect (sock, (struct sockaddr *) &echoserver, sizeof (echoserver)) < 0) {
+      //Die ("Failed to connect with server");
+      fprintf(stderr,"Failed to connect with server (%s:%d): %s",adrIPp,atoi(argv[2]),strerror(errno));
+      exit(1);
+  } 
+  shutdown (sock, 2);
+//  fprintf(stdout," [OK]\n");
+  exit(0);
 }