Ticket #443: tcpreplay-3.4.4-units.patch

tcpreplay-3.4.4/src/send_packets.c

@@ -436 +436 @@
          * a constant 'rate' (bytes per second).
          */
         if (pkts_sent != 0) {
-            n = (float)len / (options.speed.speed * 1024 * 1024 / 8); /* convert Mbps to bps */
+            n = (float)len / (options.speed.speed * 1000 * 1000 / 8); /* convert Mbps to bps */
             nap.tv_sec = n;
             nap.tv_nsec = (n - nap.tv_sec)  * 1000000000;
 

tcpreplay-3.4.4/src/common/utils.c

@@ -141 +141 @@
     if (timerisset(&diff)) {
         if (bytes_sent){
             bytes_sec = bytes_sent / frac_sec;
-            mb_sec = (bytes_sec * 8) / (1024 * 1024);
+            mb_sec = (bytes_sec * 8) / (1000 * 1000);
         }
         if (pkts_sent)
             pkts_sec = pkts_sent / frac_sec;
     }
     printf("Actual: " COUNTER_SPEC " packets (" COUNTER_SPEC " bytes) sent in %.02f seconds.",
             pkts_sent, bytes_sent, frac_sec);
-    printf("\t\tRated: %.1f bps, %.2f Mbps, %.2f pps\n",
+    printf("\t\tRated: %.1f Bps, %.2f Mbps, %.2f pps\n",
            bytes_sec, mb_sec, pkts_sec);
 
     if (failed)