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

ipc: Retry receiving credentials if the the message is short #476

Merged
merged 2 commits into from
Nov 25, 2022
Merged

ipc: Retry receiving credentials if the the message is short #476

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc7c964
ipc: Retry receiving credentials if the the message is short
chrissie-c Nov 7, 2022
5befe23
ic: Use nanosleep() instead of usleep()
chrissie-c Nov 9, 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
12 changes: 11 additions & 1 deletion lib/ipc_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,11 +473,15 @@ qb_ipcc_us_setup_connect(struct qb_ipcc_connection *c,
return 0;
}

#define AUTH_RECV_MAX_RETRIES 10
#define AUTH_RECV_SLEEP_TIME_US 100

/* Called from ipcc_connect_continue() when async connect socket is active */
int qb_ipcc_setup_connect_continue(struct qb_ipcc_connection *c, struct qb_ipc_connection_response *r)
{
struct ipc_auth_data *data;
int32_t res;
int retry_count = 0;
#ifdef QB_LINUX
int off = 0;
#endif
Expand All @@ -486,8 +490,14 @@ int qb_ipcc_setup_connect_continue(struct qb_ipcc_connection *c, struct qb_ipc_c
qb_ipcc_us_sock_close(c->setup.u.us.sock);
return -ENOMEM;
}

retry:
res = qb_ipc_us_recv_msghdr(data);
if (res == -EAGAIN && ++retry_count < AUTH_RECV_MAX_RETRIES) {
struct timespec ts = {0, AUTH_RECV_SLEEP_TIME_US*QB_TIME_NS_IN_USEC};
struct timespec ts_left = {0, 0};
nanosleep(&ts, &ts_left);
goto retry;
}

#ifdef QB_LINUX
setsockopt(c->setup.u.us.sock, SOL_SOCKET, SO_PASSCRED, &off,
Expand Down