Show client's target bitrate (-b/--bitrate) in server output (json,verbose) (#776)
Fixes #599.
Этот коммит содержится в:
родитель
af34c411df
Коммит
197d27ac76
@ -692,6 +692,8 @@ iperf_on_connect(struct iperf_test *test)
|
|||||||
else {
|
else {
|
||||||
cJSON_AddNumberToObject(test->json_start, "tcp_mss_default", test->ctrl_sck_mss);
|
cJSON_AddNumberToObject(test->json_start, "tcp_mss_default", test->ctrl_sck_mss);
|
||||||
}
|
}
|
||||||
|
if (test->settings->rate)
|
||||||
|
cJSON_AddNumberToObject(test->json_start, "target_bitrate", test->settings->rate);
|
||||||
}
|
}
|
||||||
} else if (test->verbose) {
|
} else if (test->verbose) {
|
||||||
iperf_printf(test, report_cookie, test->cookie);
|
iperf_printf(test, report_cookie, test->cookie);
|
||||||
@ -702,7 +704,8 @@ iperf_on_connect(struct iperf_test *test)
|
|||||||
iperf_printf(test, " TCP MSS: %d (default)\n", test->ctrl_sck_mss);
|
iperf_printf(test, " TCP MSS: %d (default)\n", test->ctrl_sck_mss);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (test->settings->rate)
|
||||||
|
iperf_printf(test, " Target Bitrate: %llu\n", test->settings->rate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1726,6 +1729,8 @@ get_parameters(struct iperf_test *test)
|
|||||||
#endif //HAVE_SSL
|
#endif //HAVE_SSL
|
||||||
if (test->sender && test->protocol->id == Ptcp && has_tcpinfo_retransmits())
|
if (test->sender && test->protocol->id == Ptcp && has_tcpinfo_retransmits())
|
||||||
test->sender_has_retransmits = 1;
|
test->sender_has_retransmits = 1;
|
||||||
|
if (test->settings->rate)
|
||||||
|
cJSON_AddNumberToObject(test->json_start, "target_bitrate", test->settings->rate);
|
||||||
cJSON_Delete(j);
|
cJSON_Delete(j);
|
||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user