From a8285f246c3421deaea5df11499bfc525f521ef2 Mon Sep 17 00:00:00 2001
From: Marcel Poul <marcel.poul@cern.ch>
Date: Thu, 17 Nov 2011 22:06:15 +0000
Subject: [PATCH] accept inproved - try all addresses in hostent structure

---
 emi.canl.canl-c/src/canl.c               | 38 ++++++++++++++++++++++++--------
 emi.canl.canl-c/src/canl_sample_server.c |  7 ++++--
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/emi.canl.canl-c/src/canl.c b/emi.canl.canl-c/src/canl.c
index aad5a0d..86a229b 100644
--- a/emi.canl.canl-c/src/canl.c
+++ b/emi.canl.canl-c/src/canl.c
@@ -151,6 +151,7 @@ int canl_io_connect(canl_ctx cc, canl_io_handler io, char * host, int port,
     glb_ctx *glb_cc = (glb_ctx*) cc;
     int sock;
     struct sockaddr_in *sa_in = NULL;
+    int i = 0;
 
     /*check cc and io*/
     if (!glb_cc) {
@@ -163,13 +164,26 @@ int canl_io_connect(canl_ctx cc, canl_io_handler io, char * host, int port,
     }
 
     /*dns TODO - wrap it for using ipv6 and ipv4 at the same time*/
-    err = asyn_getservbyname(AF_INET, io_cc->ar, host, NULL);
+
     if (err)
         goto end;
-    
+
+    switch (err = asyn_getservbyname(AF_INET, io_cc->ar, host, NULL)) {
+        case NETDB_SUCCESS:
+            err = 0;
+            break;
+        case TRY_AGAIN:
+            err = ETIMEDOUT;
+            goto end;
+        case NETDB_INTERNAL:
+            err = EHOSTUNREACH; //TODO check
+            goto end;
+        default:
+            err = EHOSTUNREACH; //TODO check
+    }
+
     sa_in = (struct sockaddr_in *) io_cc->s_addr;
 
-    /*open socket TODO just for testing purpose*/
     sock = socket(AF_INET, SOCK_STREAM, 0);
     if (sock != -1)
         io_cc->sock = sock;
@@ -177,15 +191,21 @@ int canl_io_connect(canl_ctx cc, canl_io_handler io, char * host, int port,
         err = errno;
         goto end;
     }
-    
+
     sa_in->sin_family = AF_INET;
     sa_in->sin_port = htons(port);
     //TODO loop through h_addr_list
-    memcpy(&sa_in->sin_addr.s_addr, io_cc->ar->ent->h_addr, sizeof(struct in_addr));
-    err = connect(io_cc->sock, (struct sockaddr*) sa_in, sizeof(*sa_in));
-    if (err) {
-        err = errno;
-        goto end;
+    i = 0;
+    while (io_cc->ar->ent->h_addr_list[i])
+    {
+        memcpy(&sa_in->sin_addr.s_addr, io_cc->ar->ent->h_addr_list[i], 
+                sizeof(struct in_addr));
+        err = connect(io_cc->sock, (struct sockaddr*) sa_in, sizeof(*sa_in));
+        if (err) 
+            err = errno;
+        else
+            goto end; //success
+        i++;
     }
     /*TODO Maybe continue with select()*/
 
diff --git a/emi.canl.canl-c/src/canl_sample_server.c b/emi.canl.canl-c/src/canl_sample_server.c
index 44b60ad..315cba6 100644
--- a/emi.canl.canl-c/src/canl_sample_server.c
+++ b/emi.canl.canl-c/src/canl_sample_server.c
@@ -3,6 +3,8 @@
 #include <stdlib.h>
 #include "canl.h"
 
+#define BUF_LEN 1000
+
 int main(int argc, char *argv[])
 {
     canl_ctx my_ctx;
@@ -11,6 +13,7 @@ int main(int argc, char *argv[])
     int err = 0;
     char *err_msg = NULL;
     int opt, port = 4321;
+    char buf[BUF_LEN];
 
     while ((opt = getopt(argc, argv, "hp:")) != -1) {
         switch (opt) {
@@ -51,12 +54,12 @@ int main(int argc, char *argv[])
         goto end;
     }
 
-    err = canl_io_write (my_ctx, my_io_h, NULL, 0, NULL);
+    err = canl_io_write (my_ctx, my_new_io_h, NULL, 0, NULL);
     if (err) {
         //set_error ("cannot write");
     }
 
-    err = canl_io_read (my_ctx, my_io_h, NULL, 0, NULL);
+    err = canl_io_read (my_ctx, my_io_h, buf, sizeof(buf)-1, NULL);
     if (err) {
         //set_error ("cannot read");
     }
-- 
1.8.2.3