diff options
author | marshall <stmr@umich.edu> | 2023-06-22 20:58:23 -0400 |
---|---|---|
committer | marshall <stmr@umich.edu> | 2023-07-18 11:12:17 -0400 |
commit | e3a279a3e62a3b423bf72bcfb6859cee4445438c (patch) | |
tree | 8bf44cc629fbbb7517465665c189d3583de19880 /src/transport | |
parent | 1015fbf072d7e65423eb6b170b0ef21845fc71d4 (diff) | |
download | gnunet-e3a279a3e62a3b423bf72bcfb6859cee4445438c.tar.gz gnunet-e3a279a3e62a3b423bf72bcfb6859cee4445438c.zip |
transport (quic): fix compiler warnings
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-communicator-quic.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/src/transport/gnunet-communicator-quic.c b/src/transport/gnunet-communicator-quic.c index 12884bb34..8bd8deca7 100644 --- a/src/transport/gnunet-communicator-quic.c +++ b/src/transport/gnunet-communicator-quic.c | |||
@@ -124,7 +124,7 @@ gen_cid (uint8_t *cid, size_t cid_len) | |||
124 | * ASSUMES: connection is established to peer | 124 | * ASSUMES: connection is established to peer |
125 | */ | 125 | */ |
126 | static void | 126 | static void |
127 | recv_from_streams (quiche_conn *conn, char stream_buf[]) | 127 | recv_from_streams (quiche_conn *conn, char stream_buf[], size_t buf_size) |
128 | { | 128 | { |
129 | uint64_t s = 0; | 129 | uint64_t s = 0; |
130 | quiche_stream_iter *readable; | 130 | quiche_stream_iter *readable; |
@@ -139,7 +139,7 @@ recv_from_streams (quiche_conn *conn, char stream_buf[]) | |||
139 | s); | 139 | s); |
140 | fin = false; | 140 | fin = false; |
141 | recv_len = quiche_conn_stream_recv (conn, s, | 141 | recv_len = quiche_conn_stream_recv (conn, s, |
142 | stream_buf, sizeof(stream_buf), | 142 | (uint8_t *) stream_buf, buf_size, |
143 | &fin); | 143 | &fin); |
144 | if (recv_len < 0) | 144 | if (recv_len < 0) |
145 | { | 145 | { |
@@ -225,7 +225,7 @@ create_conn (uint8_t *scid, size_t scid_len, | |||
225 | /** | 225 | /** |
226 | * Check for closed connections, print stats | 226 | * Check for closed connections, print stats |
227 | */ | 227 | */ |
228 | static void | 228 | static int |
229 | check_conn_closed (void *cls, | 229 | check_conn_closed (void *cls, |
230 | const struct GNUNET_HashCode *key, | 230 | const struct GNUNET_HashCode *key, |
231 | void *value) | 231 | void *value) |
@@ -238,7 +238,7 @@ check_conn_closed (void *cls, | |||
238 | quiche_path_stats path_stats; | 238 | quiche_path_stats path_stats; |
239 | 239 | ||
240 | quiche_conn_stats (conn->conn, &stats); | 240 | quiche_conn_stats (conn->conn, &stats); |
241 | quiche_conn_path_stats (conn->conn, 0, &stats); | 241 | quiche_conn_path_stats (conn->conn, 0, &path_stats); |
242 | 242 | ||
243 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 243 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
244 | "connection closed. quiche stats: sent=%zu, recv=%zu\n", | 244 | "connection closed. quiche stats: sent=%zu, recv=%zu\n", |
@@ -250,6 +250,7 @@ check_conn_closed (void *cls, | |||
250 | quiche_conn_free (conn->conn); | 250 | quiche_conn_free (conn->conn); |
251 | GNUNET_free (conn); | 251 | GNUNET_free (conn); |
252 | } | 252 | } |
253 | return GNUNET_OK; | ||
253 | } | 254 | } |
254 | 255 | ||
255 | 256 | ||
@@ -430,8 +431,8 @@ sock_read (void *cls) | |||
430 | struct sockaddr_storage sa; | 431 | struct sockaddr_storage sa; |
431 | struct sockaddr_in *addr_verify; | 432 | struct sockaddr_in *addr_verify; |
432 | socklen_t salen = sizeof(sa); | 433 | socklen_t salen = sizeof(sa); |
433 | char buf[UINT16_MAX]; | 434 | uint8_t buf[UINT16_MAX]; |
434 | char out[MAX_DATAGRAM_SIZE]; | 435 | uint8_t out[MAX_DATAGRAM_SIZE]; |
435 | ssize_t rcvd; | 436 | ssize_t rcvd; |
436 | (void) cls; | 437 | (void) cls; |
437 | 438 | ||
@@ -465,7 +466,7 @@ sock_read (void *cls) | |||
465 | "BINDTO"); | 466 | "BINDTO"); |
466 | return; | 467 | return; |
467 | } | 468 | } |
468 | struct sock_addr *local_addr = udp_address_to_sockaddr (bindto, in_len); | 469 | struct sockaddr *local_addr = udp_address_to_sockaddr (bindto, &in_len); |
469 | 470 | ||
470 | read_task = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, | 471 | read_task = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, |
471 | udp_sock, | 472 | udp_sock, |
@@ -485,8 +486,11 @@ sock_read (void *cls) | |||
485 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "recv"); | 486 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "recv"); |
486 | return; | 487 | return; |
487 | } | 488 | } |
488 | int rc = quiche_header_info (buf, read, LOCAL_CONN_ID_LEN, &quic_header.version, | 489 | int rc = quiche_header_info (buf, rcvd, LOCAL_CONN_ID_LEN, |
489 | &quic_header.type, quic_header.scid, &quic_header.scid_len, quic_header.dcid, &quic_header.dcid_len, | 490 | &quic_header.version, |
491 | &quic_header.type, quic_header.scid, | ||
492 | &quic_header.scid_len, quic_header.dcid, | ||
493 | &quic_header.dcid_len, | ||
490 | quic_header.token, &quic_header.token_len); | 494 | quic_header.token, &quic_header.token_len); |
491 | if (0 > rc) | 495 | if (0 > rc) |
492 | { | 496 | { |
@@ -516,8 +520,10 @@ sock_read (void *cls) | |||
516 | /** | 520 | /** |
517 | * Write a version negotiation packet to "out" | 521 | * Write a version negotiation packet to "out" |
518 | */ | 522 | */ |
519 | ssize_t written = quiche_negotiate_version (quic_header.scid, quic_header.scid_len, | 523 | ssize_t written = quiche_negotiate_version (quic_header.scid, |
520 | quic_header.dcid, quic_header.dcid_len, | 524 | quic_header.scid_len, |
525 | quic_header.dcid, | ||
526 | quic_header.dcid_len, | ||
521 | out, sizeof(out)); | 527 | out, sizeof(out)); |
522 | if (0 > written) | 528 | if (0 > written) |
523 | { | 529 | { |
@@ -581,9 +587,10 @@ sock_read (void *cls) | |||
581 | // "invalid address validation token created\n"); | 587 | // "invalid address validation token created\n"); |
582 | // } | 588 | // } |
583 | 589 | ||
584 | conn = create_conn (quic_header.dcid, quic_header.dcid_len, quic_header.odcid, quic_header.odcid_len, | 590 | conn = create_conn (quic_header.dcid, quic_header.dcid_len, |
591 | quic_header.odcid, quic_header.odcid_len, | ||
585 | local_addr, in_len, | 592 | local_addr, in_len, |
586 | (struct sockaddr*) &sa, salen); | 593 | &sa, salen); |
587 | if (NULL == conn) | 594 | if (NULL == conn) |
588 | { | 595 | { |
589 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 596 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -620,7 +627,7 @@ sock_read (void *cls) | |||
620 | { | 627 | { |
621 | // Check for data on all available streams | 628 | // Check for data on all available streams |
622 | char stream_buf[UINT16_MAX]; | 629 | char stream_buf[UINT16_MAX]; |
623 | recv_from_streams (conn->conn, stream_buf); | 630 | recv_from_streams (conn->conn, stream_buf, UINT16_MAX); |
624 | } | 631 | } |
625 | 632 | ||
626 | /** | 633 | /** |