source: trunk/third-party/utp-03-msvc14.patch

Last change on this file was 14598, checked in by mikedld, 3 years ago

Add the rest of current Windows-related third-party patches

File size: 1.8 KB
  • utp.cpp

    diff --git a/utp.cpp b/utp.cpp
    a b  
    859859        int flags = version == 0 ? b->flags : b1->type();
    860860        uint16 seq_nr = version == 0 ? b->seq_nr : b1->seq_nr;
    861861        uint16 ack_nr = version == 0 ? b->ack_nr : b1->ack_nr;
    862         LOG_UTPV("0x%08x: send %s len:%u id:%u timestamp:"I64u" reply_micro:%u flags:%s seq_nr:%u ack_nr:%u",
     862        LOG_UTPV("0x%08x: send %s len:%u id:%u timestamp:" I64u " reply_micro:%u flags:%s seq_nr:%u ack_nr:%u",
    863863                         this, addrfmt(addr, addrbuf), (uint)length, conn_id_send, time, reply_micro, flagnames[flags],
    864864                         seq_nr, ack_nr);
    865865#endif
     
    17051705        // used in parse_log.py
    17061706        LOG_UTP("0x%08x: actual_delay:%u our_delay:%d their_delay:%u off_target:%d max_window:%u "
    17071707                        "delay_base:%u delay_sum:%d target_delay:%d acked_bytes:%u cur_window:%u "
    1708                         "scaled_gain:%f rtt:%u rate:%u quota:%d wnduser:%u rto:%u timeout:%d get_microseconds:"I64u" "
     1708                        "scaled_gain:%f rtt:%u rate:%u quota:%d wnduser:%u rto:%u timeout:%d get_microseconds:" I64u " "
    17091709                        "cur_window_packets:%u packet_size:%u their_delay_base:%u their_actual_delay:%u",
    17101710                        this, actual_delay, our_delay / 1000, their_hist.get_value() / 1000,
    17111711                        (int)off_target / 1000, (uint)(max_window),  our_hist.delay_base,
     
    17901790
    17911791        if (pk_flags >= ST_NUM_STATES) return 0;
    17921792
    1793         LOG_UTPV("0x%08x: Got %s. seq_nr:%u ack_nr:%u state:%s version:%u timestamp:"I64u" reply_micro:%u",
     1793        LOG_UTPV("0x%08x: Got %s. seq_nr:%u ack_nr:%u state:%s version:%u timestamp:" I64u " reply_micro:%u",
    17941794                         conn, flagnames[pk_flags], pk_seq_nr, pk_ack_nr, statenames[conn->state], conn->version,
    17951795                         conn->version == 0?(uint64)(pf->tv_sec) * 1000000 + pf->tv_usec:uint64(pf1->tv_usec),
    17961796                         conn->version == 0?(uint32)(pf->reply_micro):(uint32)(pf1->reply_micro));
Note: See TracBrowser for help on using the repository browser.