Merge pull request appneta#224 from appneta/Enhancement_#223_max_tx_duration_optimizations

fklassen · fklassen · commit 334d169c2989 · 2015-12-16T16:47:31.000-08:00
appneta#223 add timestamp backoff if TX falls behind, updated help
diff --git a/src/send_packets.c b/src/send_packets.c
@@ -503,7 +503,7 @@ send_packets(tcpreplay_t *ctx, pcap_t *pcap, int idx)
         }
 
         /* stop sending based on the duration limit*/
-        if (end_us > 0) {
+        if (end_us > 0 && (!do_not_timestamp || !(packetnum % 64))) {
             if (gettimeofday(&now, NULL) < 0)
                 errx(-1, "gettimeofday() failed: %s",  strerror(errno));
             if (TIMEVAL_TO_MICROSEC(&now) > end_us) {
@@ -522,7 +522,7 @@ send_packets(tcpreplay_t *ctx, pcap_t *pcap, int idx)
 #error WTF???  We should not be here!
 #endif
 
-        dbgx(2, "packet " COUNTER_SPEC " caplen %d", packetnum, pktlen);
+        dbgx(2, "packet " COUNTER_SPEC " caplen " COUNTER_SPEC, packetnum, pktlen);
 
         /* Dual nic processing */
         if (ctx->intf2 != NULL) {
@@ -789,7 +789,7 @@ send_dual_packets(tcpreplay_t *ctx, pcap_t *pcap1, int cache_file_idx1, pcap_t *
 #error WTF???  We should not be here!
 #endif
 
-        dbgx(2, "packet " COUNTER_SPEC " caplen %d", packetnum, pktlen);
+        dbgx(2, "packet " COUNTER_SPEC " caplen " COUNTER_SPEC, packetnum, pktlen);
 
 
 #if defined TCPREPLAY && defined TCPREPLAY_EDIT
diff --git a/src/tcpreplay_opts.def b/src/tcpreplay_opts.def
@@ -362,7 +362,7 @@ flag = {
     max         = 1;
     arg-default = -1;
     arg-range   = "1->";
-    descrip     = "Limit the trasmit duration";
+    descrip     = "Limit the number of seconds to send";
     doc         = <<- EOText
 By default, tcpreplay will send all the packets.  Alternatively, you can
 specify a maximum number of seconds to transmit.
