31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
|
diff --git a/utp.cpp b/utp.cpp
|
||
|
|
--- a/utp.cpp
|
||
|
|
+++ b/utp.cpp
|
||
|
|
@@ -859,7 +859,7 @@
|
||
|
|
int flags = version == 0 ? b->flags : b1->type();
|
||
|
|
uint16 seq_nr = version == 0 ? b->seq_nr : b1->seq_nr;
|
||
|
|
uint16 ack_nr = version == 0 ? b->ack_nr : b1->ack_nr;
|
||
|
|
- LOG_UTPV("0x%08x: send %s len:%u id:%u timestamp:"I64u" reply_micro:%u flags:%s seq_nr:%u ack_nr:%u",
|
||
|
|
+ LOG_UTPV("0x%08x: send %s len:%u id:%u timestamp:" I64u " reply_micro:%u flags:%s seq_nr:%u ack_nr:%u",
|
||
|
|
this, addrfmt(addr, addrbuf), (uint)length, conn_id_send, time, reply_micro, flagnames[flags],
|
||
|
|
seq_nr, ack_nr);
|
||
|
|
#endif
|
||
|
|
@@ -1705,7 +1705,7 @@
|
||
|
|
// used in parse_log.py
|
||
|
|
LOG_UTP("0x%08x: actual_delay:%u our_delay:%d their_delay:%u off_target:%d max_window:%u "
|
||
|
|
"delay_base:%u delay_sum:%d target_delay:%d acked_bytes:%u cur_window:%u "
|
||
|
|
- "scaled_gain:%f rtt:%u rate:%u quota:%d wnduser:%u rto:%u timeout:%d get_microseconds:"I64u" "
|
||
|
|
+ "scaled_gain:%f rtt:%u rate:%u quota:%d wnduser:%u rto:%u timeout:%d get_microseconds:" I64u " "
|
||
|
|
"cur_window_packets:%u packet_size:%u their_delay_base:%u their_actual_delay:%u",
|
||
|
|
this, actual_delay, our_delay / 1000, their_hist.get_value() / 1000,
|
||
|
|
(int)off_target / 1000, (uint)(max_window), our_hist.delay_base,
|
||
|
|
@@ -1790,7 +1790,7 @@
|
||
|
|
|
||
|
|
if (pk_flags >= ST_NUM_STATES) return 0;
|
||
|
|
|
||
|
|
- LOG_UTPV("0x%08x: Got %s. seq_nr:%u ack_nr:%u state:%s version:%u timestamp:"I64u" reply_micro:%u",
|
||
|
|
+ LOG_UTPV("0x%08x: Got %s. seq_nr:%u ack_nr:%u state:%s version:%u timestamp:" I64u " reply_micro:%u",
|
||
|
|
conn, flagnames[pk_flags], pk_seq_nr, pk_ack_nr, statenames[conn->state], conn->version,
|
||
|
|
conn->version == 0?(uint64)(pf->tv_sec) * 1000000 + pf->tv_usec:uint64(pf1->tv_usec),
|
||
|
|
conn->version == 0?(uint32)(pf->reply_micro):(uint32)(pf1->reply_micro));
|