From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Thu, 8 Dec 2011 09:10:14 +0000 (+0000)
Subject: - some error handling improvements
X-Git-Tag: merge_30_head_take2_after~24
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c350efabc2a5283d03abe7ff2117c869547f3f23;p=jra1mw.git

- some error handling improvements
- canl_io_destroy is enough to close connection
---

diff --git a/emi.canl.canl-c/src/canl_sample_client.c b/emi.canl.canl-c/src/canl_sample_client.c
index 4583cb0..ca82cfa 100644
--- a/emi.canl.canl-c/src/canl_sample_client.c
+++ b/emi.canl.canl-c/src/canl_sample_client.c
@@ -9,7 +9,7 @@
 int main(int argc, char *argv[])
 {
     canl_ctx my_ctx;
-    canl_io_handler my_io_h;
+    canl_io_handler my_io_h = NULL;
     int err = 0;
     char *err_msg = NULL;
     char buf[BUF_LEN];
@@ -43,13 +43,14 @@ int main(int argc, char *argv[])
 
     my_ctx = canl_create_ctx();
     if (!my_ctx){
-        // set_error("context cannot be created\n");
+	printf("CANL context cannot be created, exiting.\n");
         goto end;
     }
 
     my_io_h = canl_create_io_handler(my_ctx);
     if (!my_io_h) {
-        //set_error("io handler cannot be created\n");
+	printf("io handler cannot be created: %s\n",
+	       canl_get_error_message(my_ctx));
         goto end;
     }
 
@@ -72,7 +73,8 @@ int main(int argc, char *argv[])
     printf("[CLIENT] Trying to send sth to the server\n");
     err = canl_io_write (my_ctx, my_io_h, buf, buf_len, &timeout);
     if (err <= 0) {
-        printf("can't write using ssl\n");
+        printf("can't write using ssl: %s\n",
+	       canl_get_error_message(my_ctx));
         goto end;
     }
     else {
@@ -86,18 +88,10 @@ int main(int argc, char *argv[])
         printf ("[CLIENT] received: %s\n", buf);
     }
 
-    err = canl_io_close(my_ctx, my_io_h);
-    if (err){
-        printf("[CLIENT] Cannot close connection to server\n");
-    }
-
-    err = canl_io_destroy(my_ctx, my_io_h);
-    if (err){
-        printf("[CLIENT] Cannot destroy connection with server\n");
-    }
-    my_io_h = NULL;
-
 end:
+    if (my_io_h)
+	err = canl_io_destroy(my_ctx, my_io_h);
+
     canl_free_ctx(my_ctx);
 
     return err;
diff --git a/emi.canl.canl-c/src/canl_sample_server.c b/emi.canl.canl-c/src/canl_sample_server.c
index 081f210..0a24512 100644
--- a/emi.canl.canl-c/src/canl_sample_server.c
+++ b/emi.canl.canl-c/src/canl_sample_server.c
@@ -13,7 +13,7 @@ static void print_error_from_canl(canl_ctx cc);
 int main(int argc, char *argv[])
 {
     canl_ctx my_ctx;
-    canl_io_handler my_io_h;
+    canl_io_handler my_io_h = NULL;
     canl_io_handler my_new_io_h;
     int err = 0;
     int opt, port = 4321;