Fix breakage due to iperf.h depending on the autoconf config.h file but

not including it.

To fix this required us to change config.h to iperf_config.h (to
avoid potential filename collisions with this generic name).  Then
iperf.h could include this.

Adjust the existing header file inclusions to track this, and also
canonicalize their inclusion to be at the top of *.c files.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/iperf_api.c b/src/iperf_api.c
index b06f74d..dc62ff7 100644
--- a/src/iperf_api.c
+++ b/src/iperf_api.c
@@ -10,6 +10,8 @@
 #define _GNU_SOURCE
 #define __USE_GNU
 
+#include "iperf_config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -40,7 +42,6 @@
 #include <sys/cpuset.h>
 #endif /* HAVE_CPUSET_SETAFFINITY */
 
-#include "config.h"
 #include "net.h"
 #include "iperf.h"
 #include "iperf_api.h"
@@ -622,7 +623,8 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
                 test->json_output = 1;
                 break;
             case 'v':
-                printf("%s\n%s\n", version, get_system_info());
+                printf("%s\n%s\n%s\n", version, get_system_info(), 
+		       get_optional_features());
                 exit(0);
             case 's':
                 if (test->role == 'c') {
@@ -819,6 +821,10 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
         }
     }
 
+    if (test->debug) {
+	printf("fubar\n");
+    }
+
     /* Set logging to a file if specified, otherwise use the default (stdout) */
     if (test->logfile) {
 	test->outfile = fopen(test->logfile, "a+");