diff options
Diffstat (limited to 'sway')
-rw-r--r-- | sway/ipc-server.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 62bdccb8..8ba8b9ba 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -242,7 +242,6 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) { | |||
242 | } | 242 | } |
243 | 243 | ||
244 | uint8_t buf[IPC_HEADER_SIZE]; | 244 | uint8_t buf[IPC_HEADER_SIZE]; |
245 | uint32_t *buf32 = (uint32_t*)(buf + sizeof(ipc_magic)); | ||
246 | // Should be fully available, because read_available >= IPC_HEADER_SIZE | 245 | // Should be fully available, because read_available >= IPC_HEADER_SIZE |
247 | ssize_t received = recv(client_fd, buf, IPC_HEADER_SIZE, 0); | 246 | ssize_t received = recv(client_fd, buf, IPC_HEADER_SIZE, 0); |
248 | if (received == -1) { | 247 | if (received == -1) { |
@@ -257,8 +256,8 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) { | |||
257 | return 0; | 256 | return 0; |
258 | } | 257 | } |
259 | 258 | ||
260 | memcpy(&client->pending_length, &buf32[0], sizeof(buf32[0])); | 259 | memcpy(&client->pending_length, buf + sizeof(ipc_magic), sizeof(uint32_t)); |
261 | memcpy(&client->pending_type, &buf32[1], sizeof(buf32[1])); | 260 | memcpy(&client->pending_type, buf + sizeof(ipc_magic) + sizeof(uint32_t), sizeof(uint32_t)); |
262 | 261 | ||
263 | if (read_available - received >= (long)client->pending_length) { | 262 | if (read_available - received >= (long)client->pending_length) { |
264 | // Reset pending values. | 263 | // Reset pending values. |
@@ -920,11 +919,10 @@ bool ipc_send_reply(struct ipc_client *client, enum ipc_command_type payload_typ | |||
920 | assert(payload); | 919 | assert(payload); |
921 | 920 | ||
922 | char data[IPC_HEADER_SIZE]; | 921 | char data[IPC_HEADER_SIZE]; |
923 | uint32_t *data32 = (uint32_t*)(data + sizeof(ipc_magic)); | ||
924 | 922 | ||
925 | memcpy(data, ipc_magic, sizeof(ipc_magic)); | 923 | memcpy(data, ipc_magic, sizeof(ipc_magic)); |
926 | memcpy(&data32[0], &payload_length, sizeof(payload_length)); | 924 | memcpy(data + sizeof(ipc_magic), &payload_length, sizeof(payload_length)); |
927 | memcpy(&data32[1], &payload_type, sizeof(payload_type)); | 925 | memcpy(data + sizeof(ipc_magic) + sizeof(payload_length), &payload_type, sizeof(payload_type)); |
928 | 926 | ||
929 | while (client->write_buffer_len + IPC_HEADER_SIZE + payload_length >= | 927 | while (client->write_buffer_len + IPC_HEADER_SIZE + payload_length >= |
930 | client->write_buffer_size) { | 928 | client->write_buffer_size) { |