tcp/quic lab bug fixed
This commit is contained in:
@ -12,7 +12,12 @@
|
||||
#define MAX_DATAGRAM_SIZE 1350
|
||||
#define TARGET_MB 100
|
||||
|
||||
// void debug_log(const char *line, void *argp) {
|
||||
// fprintf(stderr, "%s\n", line);
|
||||
// }
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
// quiche_enable_debug_logging(debug_log, NULL);
|
||||
quiche_config *config = quiche_config_new(QUICHE_PROTOCOL_VERSION);
|
||||
if (config == NULL) return -1;
|
||||
|
||||
@ -38,6 +43,13 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
if (connect(sock, (struct sockaddr *)&peer_addr, sizeof(peer_addr)) < 0) return -1;
|
||||
|
||||
struct sockaddr_in local_addr;
|
||||
socklen_t local_addr_len = sizeof(local_addr);
|
||||
if (getsockname(sock, (struct sockaddr *)&local_addr, &local_addr_len) < 0) {
|
||||
perror("getsockname");
|
||||
return -1;
|
||||
}
|
||||
|
||||
int flags = fcntl(sock, F_GETFL, 0);
|
||||
fcntl(sock, F_SETFL, flags | O_NONBLOCK);
|
||||
|
||||
@ -48,7 +60,11 @@ int main(int argc, char *argv[]) {
|
||||
close(rng);
|
||||
}
|
||||
|
||||
quiche_conn *conn = quiche_connect("127.0.0.1", (const uint8_t *)scid, sizeof(scid), NULL, 0, (struct sockaddr *)&peer_addr, sizeof(peer_addr), config);
|
||||
quiche_conn *conn = quiche_connect("127.0.0.1", (const uint8_t *)scid, sizeof(scid), (struct sockaddr *)&local_addr, local_addr_len, (struct sockaddr *)&peer_addr, sizeof(peer_addr), config);
|
||||
if (conn == NULL) {
|
||||
fprintf(stderr, "quiche_connect failed\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
printf("Connecting to QUIC Perf Server and sending %d MB...\n", TARGET_MB);
|
||||
|
||||
@ -65,16 +81,20 @@ int main(int argc, char *argv[]) {
|
||||
ssize_t read_len = recv(sock, buf, sizeof(buf), 0);
|
||||
if (read_len > 0) {
|
||||
quiche_conn_recv(conn, buf, read_len, &(quiche_recv_info){
|
||||
.to = NULL,
|
||||
.to_len = 0,
|
||||
.to = (struct sockaddr *)&local_addr,
|
||||
.to_len = local_addr_len,
|
||||
.from = (struct sockaddr *)&peer_addr,
|
||||
.from_len = sizeof(peer_addr),
|
||||
});
|
||||
}
|
||||
|
||||
if (quiche_conn_is_closed(conn)) break;
|
||||
if (quiche_conn_is_closed(conn)) {
|
||||
printf("Connection closed.\n");
|
||||
break;
|
||||
}
|
||||
|
||||
if (quiche_conn_is_established(conn)) {
|
||||
// printf("Connection established.\n");
|
||||
while (!finished_sending) {
|
||||
uint64_t err_code = 0;
|
||||
ssize_t sent = quiche_conn_stream_send(conn, 4, payload, sizeof(payload), false, &err_code);
|
||||
@ -106,4 +126,4 @@ int main(int argc, char *argv[]) {
|
||||
quiche_conn_free(conn);
|
||||
quiche_config_free(config);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user