PapaTutuWawa/gpu-screen-recorder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly send socketpair fd to kms server

Browse Source
This commit is contained in:
dec05eba 2023-11-18 13:55:27 +01:00
parent 7bc7269652
commit 2cbcde19f6
2 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kms/client/kms_client.c
View File

@ -53,11 +53,29 @@ static int send_msg_to_server(int server_fd, gsr_kms_request *request) {
iov.iov_base = request; iov.iov_base = request;
iov.iov_len = sizeof(*request); iov.iov_len = sizeof(*request);
struct msghdr request_message = {0}; struct msghdr response_message = {0};
request_message.msg_iov = &iov; response_message.msg_iov = &iov;
request_message.msg_iovlen = 1; response_message.msg_iovlen = 1;
return sendmsg(server_fd, &request_message, 0); char cmsgbuf[CMSG_SPACE(sizeof(int) * 1)];
memset(cmsgbuf, 0, sizeof(cmsgbuf));
if(request->new_connection_fd > 0) {
response_message.msg_control = cmsgbuf;
response_message.msg_controllen = sizeof(cmsgbuf);
struct cmsghdr *cmsg = CMSG_FIRSTHDR(&response_message);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(sizeof(int) * 1);
int *fds = (int*)CMSG_DATA(cmsg);
fds[0] = request->new_connection_fd;
response_message.msg_controllen = cmsg->cmsg_len;
}
return sendmsg(server_fd, &response_message, 0);
} }
static int recv_msg_from_server(int server_fd, gsr_kms_response *response) { static int recv_msg_from_server(int server_fd, gsr_kms_response *response) {

43
kms/server/kms_server.c
View File

@ -68,6 +68,40 @@ static int send_msg_to_client(int client_fd, gsr_kms_response *response) {
return sendmsg(client_fd, &response_message, 0); return sendmsg(client_fd, &response_message, 0);
} }
static int recv_msg_from_client(int client_fd, gsr_kms_request *request) {
struct iovec iov;
iov.iov_base = request;
iov.iov_len = sizeof(*request);
struct msghdr response_message = {0};
response_message.msg_iov = &iov;
response_message.msg_iovlen = 1;
char cmsgbuf[CMSG_SPACE(sizeof(int) * 1)];
memset(cmsgbuf, 0, sizeof(cmsgbuf));
response_message.msg_control = cmsgbuf;
response_message.msg_controllen = sizeof(cmsgbuf);
int res = recvmsg(client_fd, &response_message, MSG_WAITALL);
if(res <= 0)
return res;
if(request->new_connection_fd > 0) {
struct cmsghdr *cmsg = CMSG_FIRSTHDR(&response_message);
if(cmsg) {
int *fds = (int*)CMSG_DATA(cmsg);
request->new_connection_fd = fds[0];
} else {
if(request->new_connection_fd > 0) {
close(request->new_connection_fd);
request->new_connection_fd = 0;
}
}
}
return res;
}
static bool connector_get_property_by_name(int drmfd, drmModeConnectorPtr props, const char *name, uint64_t *result) { static bool connector_get_property_by_name(int drmfd, drmModeConnectorPtr props, const char *name, uint64_t *result) {
for(int i = 0; i < props->count_props; ++i) { for(int i = 0; i < props->count_props; ++i) {
drmModePropertyPtr prop = drmModeGetProperty(drmfd, props->props[i]); drmModePropertyPtr prop = drmModeGetProperty(drmfd, props->props[i]);
@ -410,14 +444,9 @@ int main(int argc, char **argv) {
gsr_kms_request request; gsr_kms_request request;
request.version = 0; request.version = 0;
request.type = -1; request.type = -1;
struct iovec iov; request.new_connection_fd = 0;
iov.iov_base = &request;
iov.iov_len = sizeof(request);
struct msghdr request_message = {0}; const int recv_res = recv_msg_from_client(socket_fd, &request);
request_message.msg_iov = &iov;
request_message.msg_iovlen = 1;
const int recv_res = recvmsg(socket_fd, &request_message, MSG_WAITALL);
if(recv_res == 0) { if(recv_res == 0) {
fprintf(stderr, "kms server info: kms client shutdown, shutting down the server\n"); fprintf(stderr, "kms server info: kms client shutdown, shutting down the server\n");
res = 3; res = 3;