ceos/cagebreak
1
0
Fork 0
mirror of https://cagebreak.project-repo.co/cagebreak.git synced 2026-08-23 14:04:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Ameliorate ipc

Browse source
This commit is contained in:
project-repo 2020-05-22 09:05:41 +02:00
commit 5c0d68e2e5
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ipc_server.c
View file

@ -172,7 +172,7 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
}
int read_available;
if (ioctl(client_fd, FIONREAD, &read_available) == -1) {
if (ioctl(client_fd, FIONREAD, &read_available) < 0) {
wlr_log(WLR_ERROR, "Unable to read IPC socket buffer size");
ipc_client_disconnect(client);
return 0;
@ -219,7 +219,7 @@ void ipc_client_handle_command(struct cg_ipc_client *client) {
}
client->read_buffer[client->read_buf_len]='\0';
char *nl_pos;
int offset=0;
uint32_t offset=0;
while((nl_pos = strchr(client->read_buffer+offset,'\n')) != NULL){
if(client->read_discard) {
client->read_discard = 0;
@ -233,11 +233,11 @@ void ipc_client_handle_command(struct cg_ipc_client *client) {
}
}
}
offset+=(nl_pos-client->read_buffer)+1;
offset=(nl_pos-client->read_buffer)+1;
}
if(client->read_buf_len-offset == MAX_LINE_SIZE+1) {
if(offset == 0) {
wlr_log(WLR_ERROR, "Line received was longer that %d, discarding it",MAX_LINE_SIZE);
client->read_buf_len =0;
client->read_buf_len = 0;
client->read_discard = 1;
return;
}

2
ipc_server.h
View file

@ -20,7 +20,7 @@ struct cg_ipc_client {
size_t write_buffer_size;
char *write_buffer;
// The following is for storing data between event_loop calls
uint8_t read_buf_len;
uint16_t read_buf_len;
uint8_t read_discard;// 1 if the current line is to be discarded
char *read_buffer;
};