aboutsummaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorsethdelliott <sethdelliott@gmail.com>2010-06-14 23:49:41 +0000
committersethdelliott <sethdelliott@gmail.com>2010-06-14 23:49:41 +0000
commitaebbe3a08f5e46f68aa95770d5b827250093815b (patch)
tree5a6acf681e3f189c0d7f97dc9b694bebf3713f72 /src/main.c
parente088d2d30575e349efec9740c5f760643883d5eb (diff)
downloadiperf3-aebbe3a08f5e46f68aa95770d5b827250093815b.tar.gz
Updated the client code to behave like the state machine for TEST_START
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 86f1a47..65e8fdc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,6 +28,7 @@
#include "units.h"
#include "locale.h"
+
int iperf_run(struct iperf_test * test);
/**************************************************************************/
@@ -53,10 +54,15 @@ static struct option longopts[] =
{"verbose", no_argument, NULL, 'V'},
{"debug", no_argument, NULL, 'd'},
{"help", no_argument, NULL, 'h'},
+ {"daemon", no_argument, NULL, 'D'},
+ {"format", required_argument, NULL, 'f'},
+
+/* The following ifdef needs to be split up. linux-congestion is not necessarily supported
+ * by systems that support tos.
+ */
#ifdef ADD_WHEN_SUPPORTED
{"tos", required_argument, NULL, 'S'},
{"linux-congestion", required_argument, NULL, 'Z'},
- {"daemon", no_argument, NULL, 'D'},
#endif
{NULL, 0, NULL, 0}
};
@@ -71,6 +77,11 @@ main(int argc, char **argv)
struct iperf_test *test;
int port = PORT;
+ // The following lines need to be removed and moved to somewhere else!!!
+ const char *usage_long1 = "this is usage_long1";
+ const char *usage_long2 = "this is usage_long2";
+
+
#ifdef TEST_PROC_AFFINITY
/* didnt seem to work.... */
/*
@@ -230,8 +241,8 @@ main(int argc, char **argv)
/* exit until this is done.... */
if (test->protocol == Pudp) {
- printf("UDP mode not yet supported. Exiting. \n");
- exit(0);
+ printf("UDP mode not yet supported. Exiting. \n");
+ exit(0);
}
//printf("in main: calling iperf_init_test \n");