diff options
author | Haibo Huang <hhb@google.com> | 2020-08-18 16:24:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-18 16:24:55 +0000 |
commit | 6505f976c2ed431621aad97eae297255bcb5f662 (patch) | |
tree | 721420473c607e66455dc8270e13734482d32de5 /src/iperf_api.h | |
parent | 7e04f70fe377dec2875e73fdf297a659d37b0a52 (diff) | |
parent | c5cac7b0eb71ebeb6595f85104ae3a5b24356dbe (diff) | |
download | iperf3-6505f976c2ed431621aad97eae297255bcb5f662.tar.gz |
Upgrade iperf3 to 3.9 am: c5cac7b0eb
Original change: https://android-review.googlesource.com/c/platform/external/iperf3/+/1402114
Change-Id: I64e3d07ca9ebcf8949a256b17cd3a5c08ae4ebfe
Diffstat (limited to 'src/iperf_api.h')
-rw-r--r-- | src/iperf_api.h | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/src/iperf_api.h b/src/iperf_api.h index 3770b37..a51b773 100644 --- a/src/iperf_api.h +++ b/src/iperf_api.h @@ -45,6 +45,10 @@ struct iperf_interval_results; struct iperf_stream; struct iperf_time; +#if !defined(__IPERF_H) +typedef uint64_t iperf_size_t; +#endif // __IPERF_H + /* default settings */ #define Ptcp SOCK_STREAM #define Pudp SOCK_DGRAM @@ -73,6 +77,8 @@ struct iperf_time; #define OPT_REPEATING_PAYLOAD 18 #define OPT_EXTRA_DATA 19 #define OPT_BIDIRECTIONAL 20 +#define OPT_SERVER_BITRATE_LIMIT 21 +#define OPT_TIMESTAMPS 22 /* states */ #define TEST_START 1 @@ -113,6 +119,8 @@ double iperf_get_test_reporter_interval( struct iperf_test* ipt ); double iperf_get_test_stats_interval( struct iperf_test* ipt ); int iperf_get_test_num_streams( struct iperf_test* ipt ); int iperf_get_test_repeating_payload( struct iperf_test* ipt ); +int iperf_get_test_timestamps( struct iperf_test* ipt ); +const char* iperf_get_test_timestamp_format( struct iperf_test* ipt ); int iperf_get_test_server_port( struct iperf_test* ipt ); char* iperf_get_test_server_hostname( struct iperf_test* ipt ); char* iperf_get_test_template( struct iperf_test* ipt ); @@ -139,7 +147,7 @@ void iperf_set_test_reporter_interval( struct iperf_test* ipt, double reporter_i void iperf_set_test_stats_interval( struct iperf_test* ipt, double stats_interval ); void iperf_set_test_state( struct iperf_test* ipt, signed char state ); void iperf_set_test_blksize( struct iperf_test* ipt, int blksize ); -void iperf_set_test_logfile( struct iperf_test* ipt, char *logfile ); +void iperf_set_test_logfile( struct iperf_test* ipt, const char *logfile ); void iperf_set_test_rate( struct iperf_test* ipt, uint64_t rate ); void iperf_set_test_pacing_timer( struct iperf_test* ipt, int pacing_timer ); void iperf_set_test_bytes( struct iperf_test* ipt, uint64_t bytes ); @@ -149,28 +157,30 @@ void iperf_set_test_server_port( struct iperf_test* ipt, int server_port ); void iperf_set_test_socket_bufsize( struct iperf_test* ipt, int socket_bufsize ); void iperf_set_test_num_streams( struct iperf_test* ipt, int num_streams ); void iperf_set_test_repeating_payload( struct iperf_test* ipt, int repeating_payload ); +void iperf_set_test_timestamps( struct iperf_test* ipt, int timestamps ); +void iperf_set_test_timestamp_format( struct iperf_test*, const char *tf ); void iperf_set_test_role( struct iperf_test* ipt, char role ); -void iperf_set_test_server_hostname( struct iperf_test* ipt, char* server_hostname ); -void iperf_set_test_template( struct iperf_test *ipt, char *tmp_template ); +void iperf_set_test_server_hostname( struct iperf_test* ipt, const char* server_hostname ); +void iperf_set_test_template( struct iperf_test *ipt, const char *tmp_template ); void iperf_set_test_reverse( struct iperf_test* ipt, int reverse ); void iperf_set_test_json_output( struct iperf_test* ipt, int json_output ); int iperf_has_zerocopy( void ); void iperf_set_test_zerocopy( struct iperf_test* ipt, int zerocopy ); void iperf_set_test_get_server_output( struct iperf_test* ipt, int get_server_output ); -void iperf_set_test_bind_address( struct iperf_test* ipt, char *bind_address ); +void iperf_set_test_bind_address( struct iperf_test* ipt, const 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_test_extra_data( struct iperf_test* ipt, char *dat ); +void iperf_set_test_extra_data( struct iperf_test* ipt, const 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); #if defined(HAVE_SSL) -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); +void iperf_set_test_client_username(struct iperf_test *ipt, const char *client_username); +void iperf_set_test_client_password(struct iperf_test *ipt, const char *client_password); +void iperf_set_test_client_rsa_pubkey(struct iperf_test *ipt, const char *client_rsa_pubkey_base64); +void iperf_set_test_server_authorized_users(struct iperf_test *ipt, const char *server_authorized_users); +void iperf_set_test_server_rsa_privkey(struct iperf_test *ipt, const char *server_rsa_privkey_base64); #endif // HAVE_SSL void iperf_set_test_connect_timeout(struct iperf_test *ipt, int ct); @@ -268,7 +278,7 @@ void iperf_catch_sigend(void (*handler)(int)); void iperf_got_sigend(struct iperf_test *test) __attribute__ ((noreturn)); void usage(void); void usage_long(FILE * f); -void warning(char *); +void warning(const char *); int iperf_exchange_results(struct iperf_test *); int iperf_init_test(struct iperf_test *); int iperf_create_send_timers(struct iperf_test *); @@ -301,6 +311,7 @@ int iperf_accept(struct iperf_test *); int iperf_handle_message_server(struct iperf_test *); int iperf_create_pidfile(struct iperf_test *); int iperf_delete_pidfile(struct iperf_test *); +void iperf_check_total_rate(struct iperf_test *, iperf_size_t); /* JSON output routines. */ int iperf_json_start(struct iperf_test *); @@ -348,6 +359,8 @@ enum { IEBADFORMAT = 24, // Bad format argument to -f IEREVERSEBIDIR = 25, // Iperf cannot be both reverse and bidirectional IEBADPORT = 26, // Bad port number + IETOTALRATE = 27, // Total required bandwidth is larger than server's limit + IETOTALINTERVAL = 28, // Invalid time interval for calculating average data rate /* Test errors */ IENEWTEST = 100, // Unable to create a new test (check perror) IEINITTEST = 101, // Test initialization failed (check perror) |