DCCP support for iperf

[iperf] / src / ReportDefault.c

diff --git a/src/ReportDefault.c b/src/ReportDefault.c
index 7944e038e07295c37e69869a4b10743c86dc1c7b..a3ecc979060091c31dc30242c9cbd946668ce274 100644 (file)
--- a/src/ReportDefault.c
+++ b/src/ReportDefault.c
@@ -75,12 +75,12 @@ void reporter_printstats( Transfer_Info *stats ) {
                    stats->mFormat);
 
     if ( stats->mUDP != (char)kMode_Server ) {
-        // TCP Reporting
+        // TCP-like Reporting
         printf( report_bw_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2] );
     } else {
-        // UDP Reporting
+        // UDP-like Reporting
         printf( report_bw_jitter_loss_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2],
@@ -110,12 +110,12 @@ void reporter_multistats( Transfer_Info *stats ) {
                    stats->mFormat);
 
     if ( stats->mUDP != (char)kMode_Server ) {
-        // TCP Reporting
+        // TCP-like Reporting
         printf( report_sum_bw_format, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2] );
     } else {
-        // UDP Reporting
+        // UDP-like Reporting
         printf( report_sum_bw_jitter_loss_format, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2],
@@ -146,19 +146,19 @@ void reporter_serverstats( Connection_Info *nused, Transfer_Info *stats ) {
 void reporter_reportsettings( ReporterData *data ) {
     int win, win_requested;
 
-    win = getsock_tcp_windowsize( data->info.transferID,
-                  (data->mThreadMode == kMode_Listener ? 0 : 1) );
-    win_requested = data->mTCPWin;
+    win = get_buffer_sock_size(data->info.transferID,
+                               data->mThreadMode != kMode_Listener);
+    win_requested = data->mWinSize;
 
     printf( seperator_line );
     if ( data->mThreadMode == kMode_Listener ) {
         printf( server_port,
-                (isUDP( data ) ? "UDP" : "TCP"), 
+                protoName(data->mProtocol),
                 data->mPort );
     } else {
         printf( client_port,
                 data->mHost,
-                (isUDP( data ) ? "UDP" : "TCP"),
+                protoName(data->mProtocol),
                 data->mPort );
     }
     if ( data->mLocalhost != NULL ) {
@@ -168,18 +168,23 @@ void reporter_reportsettings( ReporterData *data ) {
         }
     }
 
-    if ( isUDP( data ) ) {
+    if ( isPacketOriented( data ) ) {
         printf( (data->mThreadMode == kMode_Listener ? 
-                                   server_datagram_size : client_datagram_size),
+                 server_datagram_size : client_datagram_size),
                 data->mBufLen );
         if ( SockAddr_isMulticast( &data->connection.peer ) ) {
             printf( multicast_ttl, data->info.mTTL);
         }
-    }
+    } else if (data->mProtocol == kProto_DCCP)
+            printf("NOTE: running in bytestream-mode (maximum speed)\n");
+
     byte_snprintf( buffer, sizeof(buffer), win,
                    toupper( data->info.mFormat));
-    printf( "%s: %s", (isUDP( data ) ? 
-                                udp_buffer_size : tcp_window_size), buffer );
+
+    if (data->mProtocol == kProto_TCP)
+        printf( "%s: %s",  tcp_window_size, buffer);
+    else
+        printf( "%s %s: %s", protoName(data->mProtocol), dgram_buffer_size, buffer);
 
     if ( win_requested == 0 ) {
         printf( " %s", window_default );