Skip to content

Commit f3cab88

Browse files
authored
[!] fix crash on ubuntu 32 (#397)
1 parent e9e1195 commit f3cab88

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

demo/demo_server.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@ xqc_demo_svr_init_conn_settings(xqc_demo_svr_args_t *args)
14741474
break;
14751475
}
14761476

1477-
xqc_scheduler_callback_t sched;
1477+
xqc_scheduler_callback_t sched = {0};
14781478
if (strncmp(args->quic_cfg.mp_sched, "minrtt", strlen("minrtt")) == 0) {
14791479
sched = xqc_minrtt_scheduler_cb;
14801480

src/common/xqc_log_event_callback.c

+13-12
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void
140140
xqc_log_TRA_PACKET_RECEIVED_callback(xqc_log_t *log, const char *func, xqc_packet_in_t *packet_in)
141141
{
142142
xqc_log_implement(log, TRA_PACKET_RECEIVED, func,
143-
"|pkt_pns:%d|pkt_type:%d|pkt_num:%d|len:%d|frame_flag:%s|",
143+
"|pkt_pns:%d|pkt_type:%d|pkt_num:%ui|len:%uz|frame_flag:%s|",
144144
packet_in->pi_pkt.pkt_pns, packet_in->pi_pkt.pkt_type, packet_in->pi_pkt.pkt_num,
145145
packet_in->buf_size, xqc_frame_type_2_str(packet_in->pi_frame_types));
146146
}
@@ -149,7 +149,7 @@ void
149149
xqc_log_TRA_PACKET_SENT_callback(xqc_log_t *log, const char *func, xqc_packet_out_t *packet_out)
150150
{
151151
xqc_log_implement(log, TRA_PACKET_SENT, func,
152-
"|pkt_pns:%d|pkt_type:%d|pkt_num:%d|size:%d|frame_flag:%s|",
152+
"|pkt_pns:%d|pkt_type:%d|pkt_num:%ui|size:%d|frame_flag:%s|",
153153
packet_out->po_pkt.pkt_pns, packet_out->po_pkt.pkt_type, packet_out->po_pkt.pkt_num,
154154
packet_out->po_used_size, xqc_frame_type_2_str(packet_out->po_frame_types));
155155
}
@@ -175,7 +175,7 @@ void
175175
xqc_log_TRA_DATAGRAMS_SENT_callback(xqc_log_t *log, const char *func, ssize_t size)
176176
{
177177
xqc_log_implement(log, TRA_DATAGRAMS_SENT, func,
178-
"|size:%d|", size);
178+
"|size:%z|", size);
179179
}
180180

181181
void
@@ -671,20 +671,21 @@ xqc_log_QPACK_INSTRUCTION_CREATED_callback(xqc_log_t *log, const char *func, ...
671671
break;
672672
}
673673
case XQC_INS_TYPE_ENC_INSERT_NAME_REF: {
674-
xqc_int_t table_type = va_arg(args, xqc_int_t);
675-
uint64_t name_index = va_arg(args, uint64_t);
676-
uint64_t value_len = va_arg(args, uint64_t);
677-
char *value = va_arg(args, char *);
674+
xqc_flag_t table_type = va_arg(args, xqc_flag_t);
675+
uint64_t name_index = va_arg(args, uint64_t);
676+
size_t value_len = va_arg(args, size_t);
677+
char *value = va_arg(args, char *);
678678
xqc_log_implement(log, QPACK_INSTRUCTION_CREATED, func,
679679
"|insert_with_name_reference|%s|name_index:%ui|value:%*s|",
680-
table_type == XQC_DTABLE_FLAG ? "dtable" : "stable", name_index, (size_t) value_len, value);
680+
table_type == XQC_DTABLE_FLAG ? "dtable" : "stable",
681+
name_index, (size_t) value_len, value);
681682
break;
682683
}
683684
case XQC_INS_TYPE_ENC_INSERT_LITERAL: {
684-
uint64_t name_len = va_arg(args, uint64_t);
685-
char *name = va_arg(args, char *);
686-
uint64_t value_len = va_arg(args, uint64_t);
687-
char *value = va_arg(args, char *);
685+
size_t name_len = va_arg(args, size_t);
686+
char *name = va_arg(args, char *);
687+
size_t value_len = va_arg(args, size_t);
688+
char *value = va_arg(args, char *);
688689
xqc_log_implement(log, QPACK_INSTRUCTION_CREATED, func,
689690
"|insert_without_name_reference|name:%*s|value:%*s|",
690691
(size_t) name_len, name, (size_t) value_len, value);

src/transport/xqc_send_ctl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ xqc_send_ctl_on_ack_received(xqc_send_ctl_t *send_ctl, xqc_pn_ctl_t *pn_ctl, xqc
871871
xqc_log(conn->log, XQC_LOG_DEBUG,
872872
"|conn:%p|path:%ui|pkt_num:%ui|origin_pktnum:%ui|size:%ud|pns:%d|pkt_type:%s|frame:%s|conn_state:%s|frame_largest_ack:%ui|path_largest_ack:%ui|",
873873
conn, send_ctl->ctl_path->path_id, packet_out->po_pkt.pkt_num,
874-
(xqc_packet_number_t)packet_out->po_origin ? packet_out->po_origin->po_pkt.pkt_num : 0,
874+
(xqc_packet_number_t)(packet_out->po_origin ? packet_out->po_origin->po_pkt.pkt_num : 0),
875875
packet_out->po_used_size, pns,
876876
xqc_pkt_type_2_str(packet_out->po_pkt.pkt_type),
877877
xqc_frame_type_2_str(packet_out->po_frame_types),

src/transport/xqc_send_queue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ xqc_send_queue_drop_packets_with_type(xqc_send_ctl_t *send_ctl, xqc_send_queue_t
528528
xqc_send_queue_insert_free(packet_out, &send_queue->sndq_free_packets, send_queue);
529529

530530

531-
xqc_log(send_ctl->ctl_conn->log, XQC_LOG_DEBUG, "|drop pkt from unacked|inflight:%ui|cwnd:%ui|"
531+
xqc_log(send_ctl->ctl_conn->log, XQC_LOG_DEBUG, "|drop pkt from unacked|inflight:%ud|cwnd:%ui|"
532532
"pkt_num:%ui|ptype:%d|frames:%s|", send_ctl->ctl_bytes_in_flight,
533533
send_ctl->ctl_cong_callback->xqc_cong_ctl_get_cwnd(send_ctl->ctl_cong), packet_out->po_pkt.pkt_num,
534534
packet_out->po_pkt.pkt_type, xqc_frame_type_2_str(packet_out->po_frame_types));

0 commit comments

Comments
 (0)