@@ -3876,7 +3876,7 @@ iperf_print_intermediate(struct iperf_test *test)
38763876 if (test -> json_output )
38773877 cJSON_AddItemToObject (json_interval , sum_name , iperf_json_printf ("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f jitter_ms: %f lost_packets: %d packets: %d lost_percent: %f omitted: %b sender: %b" , (double ) start_time , (double ) end_time , (double ) irp -> interval_duration , (int64_t ) bytes , bandwidth * 8 , (double ) avg_jitter * 1000.0 , (int64_t ) lost_packets , (int64_t ) total_packets , (double ) lost_percent , test -> omitting , stream_must_be_sender ));
38783878 else
3879- iperf_printf (test , report_sum_bw_udp_format , mbuf , start_time , end_time , ubuf , nbuf , avg_jitter * 1000.0 , lost_packets , total_packets , lost_percent , test -> omitting ?report_omitted :"" );
3879+ iperf_printf (test , report_sum_bw_udp_format , mbuf , start_time , end_time , ubuf , nbuf , avg_jitter * 1000.0 , lost_packets , total_packets , lost_percent , ( int )(( total_packets - lost_packets ) / ( end_time - start_time )), test -> omitting ?report_omitted :"" );
38803880 }
38813881 }
38823882 }
@@ -4340,7 +4340,7 @@ iperf_print_results(struct iperf_test *test)
43404340 */
43414341 if (! (test -> role == 's' && !stream_must_be_sender ) ) {
43424342 unit_snprintf (ubuf , UNIT_LEN , (double ) total_sent , 'A' );
4343- iperf_printf (test , report_sum_bw_udp_format , mbuf , start_time , sender_time , ubuf , nbuf , 0.0 , (int64_t ) 0 , sender_total_packets , 0.0 , report_sender );
4343+ iperf_printf (test , report_sum_bw_udp_format , mbuf , start_time , sender_time , ubuf , nbuf , 0.0 , (int64_t ) 0 , sender_total_packets , 0.0 , ( int )( sender_total_packets / ( sender_time - start_time )), report_sender );
43444344 }
43454345 if (! (test -> role == 's' && stream_must_be_sender ) ) {
43464346
@@ -4353,7 +4353,7 @@ iperf_print_results(struct iperf_test *test)
43534353 bandwidth = 0.0 ;
43544354 }
43554355 unit_snprintf (nbuf , UNIT_LEN , bandwidth , test -> settings -> unit_format );
4356- iperf_printf (test , report_sum_bw_udp_format , mbuf , start_time , receiver_time , ubuf , nbuf , avg_jitter * 1000.0 , lost_packets , receiver_total_packets , lost_percent , report_receiver );
4356+ iperf_printf (test , report_sum_bw_udp_format , mbuf , start_time , receiver_time , ubuf , nbuf , avg_jitter * 1000.0 , lost_packets , receiver_total_packets , lost_percent , ( int )(( receiver_total_packets - lost_packets ) / ( receiver_time - start_time )), report_receiver );
43574357 }
43584358 }
43594359 }
0 commit comments