Merge pull request #1523 from matt9j/fix-exit-code-when-doing-json-ou…

…tput Fix exit code when using json output
esnet · Jul 3, 2023 · cc10897 · cc10897
2 parents c2fe76c + 060cde6
commit cc10897
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 30 deletions.
diff --git a/src/iperf_api.c b/src/iperf_api.c
@@ -4726,31 +4726,38 @@ iperf_json_start(struct iperf_test *test)
 int
 iperf_json_finish(struct iperf_test *test)
 {
-    if (test->title)
-	cJSON_AddStringToObject(test->json_top, "title", test->title);
-    if (test->extra_data)
-	cJSON_AddStringToObject(test->json_top, "extra_data", test->extra_data);
-    /* Include server output */
-    if (test->json_server_output) {
-	cJSON_AddItemToObject(test->json_top, "server_output_json", test->json_server_output);
-    }
-    if (test->server_output_text) {
-	cJSON_AddStringToObject(test->json_top, "server_output_text", test->server_output_text);
+    if (test->json_top) {
+        if (test->title) {
+            cJSON_AddStringToObject(test->json_top, "title", test->title);
+        }
+        if (test->extra_data) {
+            cJSON_AddStringToObject(test->json_top, "extra_data", test->extra_data);
+        }
+        /* Include server output */
+        if (test->json_server_output) {
+            cJSON_AddItemToObject(test->json_top, "server_output_json", test->json_server_output);
+        }
+        if (test->server_output_text) {
+            cJSON_AddStringToObject(test->json_top, "server_output_text", test->server_output_text);
+        }
+        // Get ASCII rendering of JSON structure.  Then make our
+        // own copy of it and return the storage that cJSON allocated
+        // on our behalf.  We keep our own copy around.
+        char *str = cJSON_Print(test->json_top);
+        if (str == NULL) {
+            return -1;
+        }
+        test->json_output_string = strdup(str);
+        cJSON_free(str);
+        if (test->json_output_string == NULL) {
+            return -1;
+        }
+        fprintf(test->outfile, "%s\n", test->json_output_string);
+        iflush(test);
+        cJSON_Delete(test->json_top);
+        test->json_top = NULL;
     }
-    // Get ASCII rendering of JSON structure.  Then make our
-    // own copy of it and return the storage that cJSON allocated
-    // on our behalf.  We keep our own copy around.
-    char *str = cJSON_Print(test->json_top);
-    if (str == NULL)
-	return -1;
-    test->json_output_string = strdup(str);
-    cJSON_free(str);
-    if (test->json_output_string == NULL)
-        return -1;
-    fprintf(test->outfile, "%s\n", test->json_output_string);
-    iflush(test);
-    cJSON_Delete(test->json_top);
-    test->json_top = test->json_start = test->json_connected = test->json_intervals = test->json_server_output = test->json_end = NULL;
+    test->json_start = test->json_connected = test->json_intervals = test->json_server_output = test->json_end = NULL;
     return 0;
 }
 

diff --git a/src/iperf_client_api.c b/src/iperf_client_api.c
@@ -708,10 +708,6 @@ iperf_run_client(struct iperf_test * test)
     if (test->json_output) {
         cJSON_AddStringToObject(test->json_top, "error", iperf_strerror(i_errno));
         iperf_json_finish(test);
-        iflush(test);
-        // Return 0 and not -1 since all terminating function were done here.
-        // Also prevents error message logging outside the already closed JSON output.
-        return 0;
     }
     iflush(test);
     return -1;

diff --git a/src/iperf_error.c b/src/iperf_error.c
@@ -96,8 +96,10 @@ iperf_errexit(struct iperf_test *test, const char *format, ...)
 
     va_start(argp, format);
     vsnprintf(str, sizeof(str), format, argp);
-    if (test != NULL && test->json_output && test->json_top != NULL) {
-	cJSON_AddStringToObject(test->json_top, "error", str);
+    if (test != NULL && test->json_output) {
+        if (test->json_top != NULL) {
+	    cJSON_AddStringToObject(test->json_top, "error", str);
+        }
 	iperf_json_finish(test);
     } else
 	if (test && test->outfile && test->outfile != stdout) {