external/slipstream
1
0
Fork 0
mirror of https://github.com/EndPositive/slipstream.git synced 2025-10-08 12:25:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Delete forced in-order processing of TCP handshakes

Browse source
This commit is contained in:
Jop Zitman 2025-04-27 16:41:38 +08:00
parent 982885f821
commit afe2a2f40a
2 changed files with 4 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/slipstream_client.c
View file

@ -32,8 +32,6 @@ typedef struct st_slipstream_client_stream_ctx_t {
int fd;
uint64_t stream_id;
volatile sig_atomic_t set_active;
int syn_sent;
int syn_received;
} slipstream_client_stream_ctx_t;
typedef struct st_slipstream_client_ctx_t {
@ -416,7 +414,6 @@ void* slipstream_client_accepter(void* arg) {
}
printf("[%lu:%d] accept: connection\n[%lu:%d] wakeup\n", stream_ctx->stream_id, client_sock, stream_ctx->stream_id, client_sock);
break;
}
free(args);
@ -446,27 +443,6 @@ int slipstream_client_callback(picoquic_cnx_t* cnx,
return 0;
}
// skip syn
if (length > 0 && !stream_ctx->syn_received) {
DBG_PRINTF("recv syn %lu\n", stream_id);
length--;
bytes++;
stream_ctx->syn_received = 1;
// allow accepting next connection
slipstream_client_accepter_args* args = malloc(sizeof(slipstream_client_accepter_args));
args->fd = client_ctx->listen_sock;
args->cnx = cnx;
args->client_ctx = client_ctx;
args->thread_ctx = client_ctx->thread_ctx;
pthread_t thread;
if (pthread_create(&thread, NULL, slipstream_client_accepter, args) != 0) {
perror("pthread_create() failed for thread");
free(args);
}
}
// printf("[%lu:%d] quic_recv->send %lu bytes\n", stream_id, stream_ctx->fd, length);
if (length > 0) {
ssize_t bytes_sent = send(stream_ctx->fd, bytes, length, MSG_NOSIGNAL);
@ -509,19 +485,6 @@ int slipstream_client_callback(picoquic_cnx_t* cnx,
slipstream_client_free_stream_ctx(client_ctx, stream_ctx);
picoquic_reset_stream(cnx, stream_id, SLIPSTREAM_FILE_CANCEL_ERROR);
// allow accepting next connection
slipstream_client_accepter_args* args = malloc(sizeof(slipstream_client_accepter_args));
args->fd = client_ctx->listen_sock;
args->cnx = cnx;
args->client_ctx = client_ctx;
args->thread_ctx = client_ctx->thread_ctx;
pthread_t thread;
if (pthread_create(&thread, NULL, slipstream_client_accepter, args) != 0) {
perror("pthread_create() failed for thread");
free(args);
}
}
break;
case picoquic_callback_stateless_reset:
@ -539,19 +502,6 @@ int slipstream_client_callback(picoquic_cnx_t* cnx,
/* This should never happen */
}
else {
if (!stream_ctx->syn_sent) {
DBG_PRINTF("send syn %lu\n", stream_id);
uint8_t* buffer = picoquic_provide_stream_data_buffer(bytes, 1, 0, 1);
if (buffer == NULL) {
/* Should never happen according to callback spec. */
break;
}
buffer[0] = 0;
stream_ctx->syn_sent = 1;
break;
}
// allow to send on stream even if we haven't syn_received
int length_available;
ret = ioctl(stream_ctx->fd, FIONREAD, &length_available);
// printf("[%lu:%d] recv->quic_send (available %d)\n", stream_id, stream_ctx->fd, length_available);

31
src/slipstream_server.c
View file

@ -185,8 +185,6 @@ typedef struct st_slipstream_server_stream_ctx_t {
int fd;
uint64_t stream_id;
volatile sig_atomic_t set_active;
int syn_received;
int syn_sent;
} slipstream_server_stream_ctx_t;
typedef struct st_slipstream_server_ctx_t {
@ -410,18 +408,11 @@ int slipstream_server_callback(picoquic_cnx_t* cnx,
// DBG_PRINTF("[stream_id=%d] quic_recv->send %lu bytes", stream_id, length);
// skip syn
if (length > 0 && !stream_ctx->syn_received) {
DBG_PRINTF("[stream_id=%d] recv syn", stream_ctx->stream_id);
length--;
bytes++;
stream_ctx->syn_received = 1;
picoquic_mark_active_stream(cnx, stream_id, 1, stream_ctx);
picoquic_set_stream_priority(cnx, stream_id, 0);
DBG_PRINTF("[stream_id=%d][leftover_length=%d]", stream_ctx->stream_id, length);
}
if (length > 0) {
DBG_PRINTF("[stream_id=%d] conn opened", stream_ctx->stream_id);
picoquic_mark_active_stream(cnx, stream_id, 1, stream_ctx);
DBG_PRINTF("[stream_id=%d][leftover_length=%d]", stream_ctx->stream_id, length);
ssize_t bytes_sent = send(stream_ctx->fd, bytes, length, MSG_NOSIGNAL);
if (bytes_sent < 0) {
if (errno == EPIPE) {
@ -481,20 +472,6 @@ int slipstream_server_callback(picoquic_cnx_t* cnx,
/* This should never happen */
}
else {
if (stream_ctx->syn_received && !stream_ctx->syn_sent) {
DBG_PRINTF("[stream_id=%d] send syn", stream_ctx->stream_id);
uint8_t* buffer = picoquic_provide_stream_data_buffer(bytes, 1, 0, 1);
if (buffer == NULL) {
/* Should never happen according to callback spec. */
break;
}
buffer[0] = 0;
stream_ctx->syn_sent = 1;
picoquic_set_stream_priority(cnx, stream_id, cnx->quic->default_stream_priority);
break;
}
// allow to send on stream even if we haven't syn_received
int length_available;
ret = ioctl(stream_ctx->fd, FIONREAD, &length_available);
// DBG_PRINTF("[stream_id=%d] recv->quic_send (available %d)", stream_id, length_available);