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

us_socket_transfer #175

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

us_socket_transfer #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f1dacc
Add new function us_socket_transfer by extracting existing code for h…
abrownsword Apr 5, 2022
ba6a887
Add new function us_socket_transfer by extracting existing code for h…
abrownsword Apr 5, 2022
eec7c40
Merge branch 'add-transfer-descriptor-func' of https://github.com/abr…
abrownsword Apr 5, 2022
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
3 changes: 3 additions & 0 deletions src/libusockets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@ WIN32_EXPORT int us_socket_local_port(int ssl, struct us_socket_t *s);
/* Copy remote (IP) address of socket, or fail with zero length. */
WIN32_EXPORT void us_socket_remote_address(int ssl, struct us_socket_t *s, char *buf, int *length);

/* transfer an accepted socket file descriptor into uS as if it were accepted by a listening socket */
WIN32_EXPORT int us_socket_transfer(int client_fd, struct us_listen_socket_t *listen_socket, void *internal_addr);

#ifdef __cplusplus
}
#endif
Expand Down
55 changes: 34 additions & 21 deletions src/loop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,39 @@ void us_internal_loop_post(struct us_loop_t *loop) {
loop->data.post_cb(loop);
}

int us_socket_transfer(int client_fd, struct us_listen_socket_t *listen_socket, void *internal_addr)
{
struct bsd_addr_t *addr = (struct bsd_addr_t*)internal_addr;
struct bsd_addr_t bsd_addr;
if (addr == NULL)
{
addr = &bsd_addr;
if (bsd_remote_addr(client_fd, &bsd_addr) == -1)
return -1;
}

struct us_poll_t *accepted_p = us_create_poll(us_socket_context(0, &listen_socket->s)->loop, 0, sizeof(struct us_socket_t) - sizeof(struct us_poll_t) + listen_socket->socket_ext_size);
us_poll_init(accepted_p, client_fd, POLL_TYPE_SOCKET);
us_poll_start(accepted_p, listen_socket->s.context->loop, LIBUS_SOCKET_READABLE);

struct us_socket_t *s = (struct us_socket_t *) accepted_p;

s->context = listen_socket->s.context;
s->timeout = 0;
s->low_prio_state = 0;

/* We always use nodelay */
bsd_socket_nodelay(client_fd, 1);

us_internal_socket_context_link(listen_socket->s.context, s);

listen_socket->s.context->on_open(s, 0, bsd_addr_get_ip(addr), bsd_addr_get_ip_length(addr));

/* Exit accept loop if listen socket was closed in on_open handler */
return us_socket_is_closed(0, &listen_socket->s);
}


void us_internal_dispatch_ready_poll(struct us_poll_t *p, int error, int events) {
switch (us_internal_poll_type(p)) {
case POLL_TYPE_CALLBACK: {
Expand Down Expand Up @@ -236,28 +269,8 @@ void us_internal_dispatch_ready_poll(struct us_poll_t *p, int error, int events)
/* Todo: stop timer if any */

do {
struct us_poll_t *accepted_p = us_create_poll(us_socket_context(0, &listen_socket->s)->loop, 0, sizeof(struct us_socket_t) - sizeof(struct us_poll_t) + listen_socket->socket_ext_size);
us_poll_init(accepted_p, client_fd, POLL_TYPE_SOCKET);
us_poll_start(accepted_p, listen_socket->s.context->loop, LIBUS_SOCKET_READABLE);

struct us_socket_t *s = (struct us_socket_t *) accepted_p;

s->context = listen_socket->s.context;
s->timeout = 0;
s->low_prio_state = 0;

/* We always use nodelay */
bsd_socket_nodelay(client_fd, 1);

us_internal_socket_context_link(listen_socket->s.context, s);

listen_socket->s.context->on_open(s, 0, bsd_addr_get_ip(&addr), bsd_addr_get_ip_length(&addr));

/* Exit accept loop if listen socket was closed in on_open handler */
if (us_socket_is_closed(0, &listen_socket->s)) {
if (us_socket_transfer(client_fd, listen_socket, &addr))
break;
}

} while ((client_fd = bsd_accept_socket(us_poll_fd(p), &addr)) != LIBUS_SOCKET_ERROR);
}
}
Expand Down