diff options
| author | Haibo Huang <hhb@google.com> | 2020-07-10 20:20:44 -0700 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2020-07-10 20:20:44 -0700 |
| commit | 25e8e69eee58ae9cf5e35e4235ac9159d580fa8b (patch) | |
| tree | 9671c280e47f1e1241d081a967adc8034b93dfc4 /src/iperf_api.h | |
| parent | cc1d057ab6d9805d4abf505f02c63b8652ed937d (diff) | |
| parent | f95924ddcfc16f2953f5b62d72112ca65ae4e70f (diff) | |
| download | iperf3-25e8e69eee58ae9cf5e35e4235ac9159d580fa8b.tar.gz | |
Upgrade iperf3 to 3.8android-r-beta-3android-r-beta-2
Change-Id: Ie2c6b685ea0ed261585080a6cdaed0ef2d80d498
Diffstat (limited to 'src/iperf_api.h')
| -rw-r--r--[-rwxr-xr-x] | src/iperf_api.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/iperf_api.h b/src/iperf_api.h index f9f964e..3770b37 100755..100644 --- a/src/iperf_api.h +++ b/src/iperf_api.h @@ -1,5 +1,5 @@ /* - * iperf, Copyright (c) 2014-2019, The Regents of the University of + * iperf, Copyright (c) 2014-2020, The Regents of the University of * California, through Lawrence Berkeley National Laboratory (subject * to receipt of any required approvals from the U.S. Dept. of * Energy). All rights reserved. @@ -128,6 +128,7 @@ int iperf_get_test_tos( struct iperf_test* ipt ); char* iperf_get_extra_data( struct iperf_test* ipt ); char* iperf_get_iperf_version(void); int iperf_get_test_no_delay( struct iperf_test* ipt ); +int iperf_get_test_connect_timeout( struct iperf_test* ipt ); /* Setter routines for some fields inside iperf_test. */ void iperf_set_verbose( struct iperf_test* ipt, int verbose ); @@ -160,7 +161,7 @@ void iperf_set_test_bind_address( struct iperf_test* ipt, char *bind_address ); void iperf_set_test_udp_counters_64bit( struct iperf_test* ipt, int udp_counters_64bit ); void iperf_set_test_one_off( struct iperf_test* ipt, int one_off ); void iperf_set_test_tos( struct iperf_test* ipt, int tos ); -void iperf_set_extra_data( struct iperf_test* ipt, char *dat); +void iperf_set_test_extra_data( struct iperf_test* ipt, char *dat ); void iperf_set_test_bidirectional( struct iperf_test* ipt, int bidirectional); void iperf_set_test_no_delay( struct iperf_test* ipt, int no_delay); @@ -168,8 +169,12 @@ void iperf_set_test_no_delay( struct iperf_test* ipt, int no_delay); void iperf_set_test_client_username(struct iperf_test *ipt, char *client_username); void iperf_set_test_client_password(struct iperf_test *ipt, char *client_password); void iperf_set_test_client_rsa_pubkey(struct iperf_test *ipt, char *client_rsa_pubkey_base64); +void iperf_set_test_server_authorized_users(struct iperf_test *ipt, char *server_authorized_users); +void iperf_set_test_server_rsa_privkey(struct iperf_test *ipt, char *server_rsa_privkey_base64); #endif // HAVE_SSL +void iperf_set_test_connect_timeout(struct iperf_test *ipt, int ct); + /** * exchange_parameters - handles the param_Exchange part for client * |