commit d65e0e69d39e1bd3a5fefc365715df972399effc
author Radek Krejci <rkrejci@cesnet.cz> Thu Aug 11 15:19:45 2016 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Thu Aug 11 15:19:45 2016 +0200
tree e55c17bf29c24140783349761f4b5750fa09a43a
parent 460dde5398fef6c4c8b8551b4343592641b87ccf

BUGFIX reporting errors when something went wrong during processing the request

Sometimes it could happen that invalid (empty) return message was returned
when some error occured in processing the request. The correct error message
were logged/printed, but the error return message for the client was empty.

src/netopeerguid.c

diff --git a/src/netopeerguid.c b/src/netopeerguid.c
index 8d4e578..49d9148 100644
--- a/src/netopeerguid.c
+++ b/src/netopeerguid.c
@@ -2251,6 +2251,8 @@
 {
     json_object *reply, *array;
 
+    ERROR(errmess);
+
     pthread_mutex_lock(&json_lock);
     reply = json_object_new_object();
     array = json_object_new_array();
@@ -2517,7 +2519,7 @@
     pthread_mutex_unlock(&json_lock);
 
     if (!target) {
-        ERROR("Missing the target parameter.");
+        reply = create_error_reply("Missing the target parameter.");
         goto finalize;
     }
     ds_type_t = parse_datastore(target);
@@ -2560,7 +2562,7 @@
     if (config) {
         locked_session = session_get_locked(session_key, NULL);
         if (!locked_session) {
-            ERROR("Unknown session or locking failed.");
+            reply = create_error_reply("Unknown session or locking failed.");
             goto finalize;
         }
 
@@ -2568,7 +2570,7 @@
         session_unlock(locked_session);
 
         if (!content) {
-            ERROR("Failed to parse edit-config content.");
+        	reply = create_error_reply("Failed to parse edit-config content.");
             goto finalize;
         }
 
@@ -2578,7 +2580,7 @@
         lyd_print_mem(&config, content, LYD_XML, LYP_WITHSIBLINGS);
         lyd_free_withsiblings(content);
         if (!config) {
-            ERROR("Failed to print edit-config content.");
+        	reply = create_error_reply("Failed to print edit-config content.");
             goto finalize;
         }
     } else {
@@ -2677,7 +2679,7 @@
     if (config) {
         locked_session = session_get_locked(session_key, NULL);
         if (!locked_session) {
-            ERROR("Unknown session or locking failed.");
+        	reply = create_error_reply("Unknown session or locking failed.");
             goto finalize;
         }
 
@@ -2845,6 +2847,7 @@
     DEBUG("LOCK wrlock %s", __func__);
     if (pthread_rwlock_rdlock(&session_lock) != 0) {
         ERROR("Error while unlocking rwlock: %d (%s)", errno, strerror(errno));
+        return create_error_reply("Internal error");
     }
 
     for (locked_session = netconf_sessions_list;
@@ -2902,7 +2905,7 @@
 
     locked_session = session_get_locked(session_key, NULL);
     if (!locked_session) {
-        ERROR("Unknown session or locking failed.");
+    	reply = create_error_reply("Unknown session or locking failed.");
         goto finalize;
     }
 
@@ -2988,7 +2991,7 @@
     DEBUG("LOCK wrlock %s", __func__);
     if (pthread_rwlock_wrlock(&session_lock) != 0) {
         ERROR("Error while unlocking rwlock: %d (%s)", errno, strerror(errno));
-        return NULL;
+        reply = create_error_reply("Internal error");
     }
 
     for (locked_session = netconf_sessions_list;