Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

examples: open connection when stdin first time available #556

Closed
wants to merge 1 commit into from
Closed

examples: open connection when stdin first time available #556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions examples/echo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,12 @@ static int send_one(int fd, struct sockaddr *dest, struct iovec *vec)
return ret;
}

static int run_loop(int fd, quicly_conn_t *client)
static int run_loop(int fd, int is_client, const char *host, struct sockaddr_storage *dest_addr)
{
quicly_conn_t *conns[256] = {client}; /* a null-terminated list of connections; proper app should use a hashmap or something */
quicly_conn_t *conns[256] = {NULL}; /* a null-terminated list of connections; proper app should use a hashmap or something */
size_t i;
int read_stdin = client != NULL;
int read_stdin = is_client;
quicly_conn_t *client = NULL;

while (1) {

Expand Down Expand Up @@ -235,11 +236,23 @@ static int run_loop(int fd, quicly_conn_t *client)
while ((rret = recvmsg(fd, &msg, 0)) == -1 && errno == EINTR)
;
if (rret > 0)
process_msg(client != NULL, conns, &msg, rret);
process_msg(is_client, conns, &msg, rret);
}

/* read stdin, send the input to the active stram */
if (FD_ISSET(0, &readfds)) {
if (is_client && client == NULL) {
/* initiate a connection, and open a stream */
int ret;
if ((ret = quicly_connect(&client, &ctx, host, (struct sockaddr *)dest_addr, NULL, &next_cid,
ptls_iovec_init(NULL, 0), NULL, NULL, NULL)) != 0) {
fprintf(stderr, "quicly_connect failed:%d\n", ret);
exit(1);
}
conns[0] = client;
quicly_stream_t *stream; /* we retain the opened stream via the on_stream_open callback */
quicly_open_stream(client, &stream, 0);
}
assert(client != NULL);
if (!forward_stdin(client))
read_stdin = 0;
Expand Down Expand Up @@ -380,20 +393,6 @@ int main(int argc, char **argv)
exit(1);
}
}

quicly_conn_t *client = NULL;
if (!is_server()) {
/* initiate a connection, and open a stream */
int ret;
if ((ret = quicly_connect(&client, &ctx, host, (struct sockaddr *)&sa, NULL, &next_cid, ptls_iovec_init(NULL, 0), NULL,
NULL, NULL)) != 0) {
fprintf(stderr, "quicly_connect failed:%d\n", ret);
exit(1);
}
quicly_stream_t *stream; /* we retain the opened stream via the on_stream_open callback */
quicly_open_stream(client, &stream, 0);
}

/* enter the event loop with a connection object */
return run_loop(fd, client);
return run_loop(fd, !is_server(), host, &sa);
}
Loading