nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix indention of src/ipc.c

This commit is contained in:
Michael Stapelberg 2010-11-21 22:03:55 +01:00
parent 4549effe15
commit a71d782da9
1 changed files with 327 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

655
src/ipc.c
View File

@ -1,5 +1,5 @@
/* /*
* vim:ts=8:expandtab * vim:ts=4:sw=4:expandtab
* *
* i3 - an improved dynamic tiling window manager * i3 - an improved dynamic tiling window manager
* *
@ -33,10 +33,10 @@ TAILQ_HEAD(ipc_client_head, ipc_client) all_clients = TAILQ_HEAD_INITIALIZER(all
* *
*/ */
static void set_nonblock(int sockfd) { static void set_nonblock(int sockfd) {
int flags = fcntl(sockfd, F_GETFL, 0); int flags = fcntl(sockfd, F_GETFL, 0);
flags |= O_NONBLOCK; flags |= O_NONBLOCK;
if (fcntl(sockfd, F_SETFL, flags) < 0) if (fcntl(sockfd, F_SETFL, flags) < 0)
err(-1, "Could not set O_NONBLOCK"); err(-1, "Could not set O_NONBLOCK");
} }
/* /*
@ -44,56 +44,56 @@ static void set_nonblock(int sockfd) {
* *
*/ */
static bool mkdirp(const char *path) { static bool mkdirp(const char *path) {
if (mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0) if (mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0)
return true; return true;
if (errno != ENOENT) { if (errno != ENOENT) {
ELOG("mkdir(%s) failed: %s\n", path, strerror(errno)); ELOG("mkdir(%s) failed: %s\n", path, strerror(errno));
return false; return false;
} }
char *copy = strdup(path); char *copy = strdup(path);
/* strip trailing slashes, if any */ /* strip trailing slashes, if any */
while (copy[strlen(copy)-1] == '/') while (copy[strlen(copy)-1] == '/')
copy[strlen(copy)-1] = '\0'; copy[strlen(copy)-1] = '\0';
char *sep = strrchr(copy, '/'); char *sep = strrchr(copy, '/');
if (sep == NULL) if (sep == NULL)
return false; return false;
*sep = '\0'; *sep = '\0';
bool result = false; bool result = false;
if (mkdirp(copy)) if (mkdirp(copy))
result = mkdirp(path); result = mkdirp(path);
free(copy); free(copy);
return result; return result;
} }
static void ipc_send_message(int fd, const unsigned char *payload, static void ipc_send_message(int fd, const unsigned char *payload,
int message_type, int message_size) { int message_type, int message_size) {
int buffer_size = strlen("i3-ipc") + sizeof(uint32_t) + int buffer_size = strlen("i3-ipc") + sizeof(uint32_t) +
sizeof(uint32_t) + message_size; sizeof(uint32_t) + message_size;
char msg[buffer_size]; char msg[buffer_size];
char *walk = msg; char *walk = msg;
strcpy(walk, "i3-ipc"); strcpy(walk, "i3-ipc");
walk += strlen("i3-ipc"); walk += strlen("i3-ipc");
memcpy(walk, &message_size, sizeof(uint32_t)); memcpy(walk, &message_size, sizeof(uint32_t));
walk += sizeof(uint32_t); walk += sizeof(uint32_t);
memcpy(walk, &message_type, sizeof(uint32_t)); memcpy(walk, &message_type, sizeof(uint32_t));
walk += sizeof(uint32_t); walk += sizeof(uint32_t);
memcpy(walk, payload, message_size); memcpy(walk, payload, message_size);
int sent_bytes = 0; int sent_bytes = 0;
int bytes_to_go = buffer_size; int bytes_to_go = buffer_size;
while (sent_bytes < bytes_to_go) { while (sent_bytes < bytes_to_go) {
int n = write(fd, msg + sent_bytes, bytes_to_go); int n = write(fd, msg + sent_bytes, bytes_to_go);
if (n == -1) { if (n == -1) {
DLOG("write() failed: %s\n", strerror(errno)); DLOG("write() failed: %s\n", strerror(errno));
return; return;
}
sent_bytes += n;
bytes_to_go -= n;
} }
sent_bytes += n;
bytes_to_go -= n;
}
} }
/* /*
@ -102,22 +102,22 @@ static void ipc_send_message(int fd, const unsigned char *payload,
* *
*/ */
void ipc_send_event(const char *event, uint32_t message_type, const char *payload) { void ipc_send_event(const char *event, uint32_t message_type, const char *payload) {
ipc_client *current; ipc_client *current;
TAILQ_FOREACH(current, &all_clients, clients) { TAILQ_FOREACH(current, &all_clients, clients) {
/* see if this client is interested in this event */ /* see if this client is interested in this event */
bool interested = false; bool interested = false;
for (int i = 0; i < current->num_events; i++) { for (int i = 0; i < current->num_events; i++) {
if (strcasecmp(current->events[i], event) != 0) if (strcasecmp(current->events[i], event) != 0)
continue; continue;
interested = true; interested = true;
break; break;
}
if (!interested)
continue;
ipc_send_message(current->fd, (const unsigned char*)payload,
message_type, strlen(payload));
} }
if (!interested)
continue;
ipc_send_message(current->fd, (const unsigned char*)payload,
message_type, strlen(payload));
}
} }
/* /*
@ -126,11 +126,11 @@ void ipc_send_event(const char *event, uint32_t message_type, const char *payloa
* *
*/ */
void ipc_shutdown() { void ipc_shutdown() {
ipc_client *current; ipc_client *current;
TAILQ_FOREACH(current, &all_clients, clients) { TAILQ_FOREACH(current, &all_clients, clients) {
shutdown(current->fd, SHUT_RDWR); shutdown(current->fd, SHUT_RDWR);
close(current->fd); close(current->fd);
} }
} }
/* /*
@ -139,116 +139,115 @@ void ipc_shutdown() {
* *
*/ */
IPC_HANDLER(command) { IPC_HANDLER(command) {
/* To get a properly terminated buffer, we copy /* To get a properly terminated buffer, we copy
* message_size bytes out of the buffer */ * message_size bytes out of the buffer */
char *command = scalloc(message_size + 1); char *command = scalloc(message_size + 1);
strncpy(command, (const char*)message, message_size); strncpy(command, (const char*)message, message_size);
LOG("IPC: received: *%s*\n", command); LOG("IPC: received: *%s*\n", command);
const char *reply = parse_cmd((const char*)command); const char *reply = parse_cmd((const char*)command);
tree_render(); tree_render();
free(command); free(command);
/* If no reply was provided, we just use the default success message */ /* If no reply was provided, we just use the default success message */
if (reply == NULL) if (reply == NULL)
reply = "{\"success\":true}"; reply = "{\"success\":true}";
ipc_send_message(fd, (const unsigned char*)reply, ipc_send_message(fd, (const unsigned char*)reply,
I3_IPC_REPLY_TYPE_COMMAND, strlen(reply)); I3_IPC_REPLY_TYPE_COMMAND, strlen(reply));
} }
void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) { void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
y(map_open); y(map_open);
ystr("id"); ystr("id");
y(integer, (long int)con); y(integer, (long int)con);
ystr("type"); ystr("type");
y(integer, con->type); y(integer, con->type);
ystr("orientation"); ystr("orientation");
y(integer, con->orientation); y(integer, con->orientation);
ystr("urgent"); ystr("urgent");
y(integer, con->urgent); y(integer, con->urgent);
ystr("focused"); ystr("focused");
y(integer, (con == focused)); y(integer, (con == focused));
ystr("layout"); ystr("layout");
y(integer, con->layout); y(integer, con->layout);
ystr("border"); ystr("border");
y(integer, con->border_style); y(integer, con->border_style);
ystr("rect"); ystr("rect");
y(map_open); y(map_open);
ystr("x"); ystr("x");
y(integer, con->rect.x); y(integer, con->rect.x);
ystr("y"); ystr("y");
y(integer, con->rect.y); y(integer, con->rect.y);
ystr("width"); ystr("width");
y(integer, con->rect.width); y(integer, con->rect.width);
ystr("height"); ystr("height");
y(integer, con->rect.height); y(integer, con->rect.height);
y(map_close); y(map_close);
ystr("name"); ystr("name");
ystr(con->name); ystr(con->name);
ystr("window"); ystr("window");
if (con->window) if (con->window)
y(integer, con->window->id); y(integer, con->window->id);
else y(null); else y(null);
ystr("nodes"); ystr("nodes");
y(array_open); y(array_open);
Con *node; Con *node;
TAILQ_FOREACH(node, &(con->nodes_head), nodes) { TAILQ_FOREACH(node, &(con->nodes_head), nodes) {
dump_node(gen, node, inplace_restart); dump_node(gen, node, inplace_restart);
}
y(array_close);
ystr("floating_nodes");
y(array_open);
TAILQ_FOREACH(node, &(con->floating_head), floating_windows) {
dump_node(gen, node, inplace_restart);
}
y(array_close);
ystr("focus");
y(array_open);
TAILQ_FOREACH(node, &(con->focus_head), nodes) {
y(integer, (long int)node);
}
y(array_close);
ystr("fullscreen_mode");
y(integer, con->fullscreen_mode);
if (inplace_restart) {
if (con->window != NULL) {
ystr("swallows");
y(array_open);
y(map_open);
ystr("id");
y(integer, con->window->id);
y(map_close);
y(array_close);
} }
y(array_close); }
ystr("floating_nodes"); y(map_close);
y(array_open);
TAILQ_FOREACH(node, &(con->floating_head), floating_windows) {
dump_node(gen, node, inplace_restart);
}
y(array_close);
ystr("focus");
y(array_open);
TAILQ_FOREACH(node, &(con->focus_head), nodes) {
y(integer, (long int)node);
}
y(array_close);
ystr("fullscreen_mode");
y(integer, con->fullscreen_mode);
if (inplace_restart) {
if (con->window != NULL) {
ystr("swallows");
y(array_open);
y(map_open);
ystr("id");
y(integer, con->window->id);
y(map_close);
y(array_close);
}
}
y(map_close);
} }
IPC_HANDLER(tree) { IPC_HANDLER(tree) {
yajl_gen gen = yajl_gen_alloc(NULL, NULL); yajl_gen gen = yajl_gen_alloc(NULL, NULL);
dump_node(gen, croot, false); dump_node(gen, croot, false);
const unsigned char *payload; const unsigned char *payload;
unsigned int length; unsigned int length;
y(get_buf, &payload, &length); y(get_buf, &payload, &length);
ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_TREE, length);
y(free);
ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_TREE, length);
y(free);
} }
/* /*
@ -371,24 +370,24 @@ IPC_HANDLER(get_outputs) {
*/ */
static int add_subscription(void *extra, const unsigned char *s, static int add_subscription(void *extra, const unsigned char *s,
unsigned int len) { unsigned int len) {
ipc_client *client = extra; ipc_client *client = extra;
DLOG("should add subscription to extra %p, sub %.*s\n", client, len, s); DLOG("should add subscription to extra %p, sub %.*s\n", client, len, s);
int event = client->num_events; int event = client->num_events;
client->num_events++; client->num_events++;
client->events = realloc(client->events, client->num_events * sizeof(char*)); client->events = realloc(client->events, client->num_events * sizeof(char*));
/* We copy the string because it is not null-terminated and strndup() /* We copy the string because it is not null-terminated and strndup()
* is missing on some BSD systems */ * is missing on some BSD systems */
client->events[event] = scalloc(len+1); client->events[event] = scalloc(len+1);
memcpy(client->events[event], s, len); memcpy(client->events[event], s, len);
DLOG("client is now subscribed to:\n"); DLOG("client is now subscribed to:\n");
for (int i = 0; i < client->num_events; i++) for (int i = 0; i < client->num_events; i++)
DLOG("event %s\n", client->events[i]); DLOG("event %s\n", client->events[i]);
DLOG("(done)\n"); DLOG("(done)\n");
return 1; return 1;
} }
/* /*
@ -397,58 +396,58 @@ static int add_subscription(void *extra, const unsigned char *s,
* *
*/ */
IPC_HANDLER(subscribe) { IPC_HANDLER(subscribe) {
yajl_handle p; yajl_handle p;
yajl_callbacks callbacks; yajl_callbacks callbacks;
yajl_status stat; yajl_status stat;
ipc_client *current, *client = NULL; ipc_client *current, *client = NULL;
/* Search the ipc_client structure for this connection */ /* Search the ipc_client structure for this connection */
TAILQ_FOREACH(current, &all_clients, clients) { TAILQ_FOREACH(current, &all_clients, clients) {
if (current->fd != fd) if (current->fd != fd)
continue; continue;
client = current; client = current;
break; break;
} }
if (client == NULL) { if (client == NULL) {
ELOG("Could not find ipc_client data structure for fd %d\n", fd); ELOG("Could not find ipc_client data structure for fd %d\n", fd);
return; return;
} }
/* Setup the JSON parser */ /* Setup the JSON parser */
memset(&callbacks, 0, sizeof(yajl_callbacks)); memset(&callbacks, 0, sizeof(yajl_callbacks));
callbacks.yajl_string = add_subscription; callbacks.yajl_string = add_subscription;
p = yajl_alloc(&callbacks, NULL, NULL, (void*)client); p = yajl_alloc(&callbacks, NULL, NULL, (void*)client);
stat = yajl_parse(p, (const unsigned char*)message, message_size); stat = yajl_parse(p, (const unsigned char*)message, message_size);
if (stat != yajl_status_ok) { if (stat != yajl_status_ok) {
unsigned char *err; unsigned char *err;
err = yajl_get_error(p, true, (const unsigned char*)message, err = yajl_get_error(p, true, (const unsigned char*)message,
message_size); message_size);
ELOG("YAJL parse error: %s\n", err); ELOG("YAJL parse error: %s\n", err);
yajl_free_error(p, err); yajl_free_error(p, err);
const char *reply = "{\"success\":false}"; const char *reply = "{\"success\":false}";
ipc_send_message(fd, (const unsigned char*)reply,
I3_IPC_REPLY_TYPE_SUBSCRIBE, strlen(reply));
yajl_free(p);
return;
}
yajl_free(p);
const char *reply = "{\"success\":true}";
ipc_send_message(fd, (const unsigned char*)reply, ipc_send_message(fd, (const unsigned char*)reply,
I3_IPC_REPLY_TYPE_SUBSCRIBE, strlen(reply)); I3_IPC_REPLY_TYPE_SUBSCRIBE, strlen(reply));
yajl_free(p);
return;
}
yajl_free(p);
const char *reply = "{\"success\":true}";
ipc_send_message(fd, (const unsigned char*)reply,
I3_IPC_REPLY_TYPE_SUBSCRIBE, strlen(reply));
} }
/* The index of each callback function corresponds to the numeric /* The index of each callback function corresponds to the numeric
* value of the message type (see include/i3/ipc.h) */ * value of the message type (see include/i3/ipc.h) */
handler_t handlers[5] = { handler_t handlers[5] = {
handle_command, handle_command,
handle_get_workspaces, handle_get_workspaces,
handle_subscribe, handle_subscribe,
handle_get_outputs, handle_get_outputs,
handle_tree handle_tree
}; };
/* /*
@ -462,87 +461,87 @@ handler_t handlers[5] = {
* *
*/ */
static void ipc_receive_message(EV_P_ struct ev_io *w, int revents) { static void ipc_receive_message(EV_P_ struct ev_io *w, int revents) {
char buf[2048]; char buf[2048];
int n = read(w->fd, buf, sizeof(buf)); int n = read(w->fd, buf, sizeof(buf));
/* On error or an empty message, we close the connection */ /* On error or an empty message, we close the connection */
if (n <= 0) { if (n <= 0) {
#if 0 #if 0
/* FIXME: I get these when closing a client socket, /* FIXME: I get these when closing a client socket,
* therefore we just treat them as an error. Is this * therefore we just treat them as an error. Is this
* correct? */ * correct? */
if (errno == EAGAIN || errno == EWOULDBLOCK) if (errno == EAGAIN || errno == EWOULDBLOCK)
return; return;
#endif #endif
/* If not, there was some kind of error. We don’t bother /* If not, there was some kind of error. We don’t bother
* and close the connection */ * and close the connection */
close(w->fd); close(w->fd);
/* Delete the client from the list of clients */ /* Delete the client from the list of clients */
ipc_client *current; ipc_client *current;
TAILQ_FOREACH(current, &all_clients, clients) { TAILQ_FOREACH(current, &all_clients, clients) {
if (current->fd != w->fd) if (current->fd != w->fd)
continue; continue;
for (int i = 0; i < current->num_events; i++) for (int i = 0; i < current->num_events; i++)
free(current->events[i]); free(current->events[i]);
/* We can call TAILQ_REMOVE because we break out of the /* We can call TAILQ_REMOVE because we break out of the
* TAILQ_FOREACH afterwards */ * TAILQ_FOREACH afterwards */
TAILQ_REMOVE(&all_clients, current, clients); TAILQ_REMOVE(&all_clients, current, clients);
break; break;
}
ev_io_stop(EV_A_ w);
DLOG("IPC: client disconnected\n");
return;
} }
/* Terminate the message correctly */ ev_io_stop(EV_A_ w);
buf[n] = '\0';
/* Check if the message starts with the i3 IPC magic code */ DLOG("IPC: client disconnected\n");
if (n < strlen(I3_IPC_MAGIC)) { return;
DLOG("IPC: message too short, ignoring\n"); }
return;
/* Terminate the message correctly */
buf[n] = '\0';
/* Check if the message starts with the i3 IPC magic code */
if (n < strlen(I3_IPC_MAGIC)) {
DLOG("IPC: message too short, ignoring\n");
return;
}
if (strncmp(buf, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC)) != 0) {
DLOG("IPC: message does not start with the IPC magic\n");
return;
}
uint8_t *message = (uint8_t*)buf;
while (n > 0) {
DLOG("IPC: n = %d\n", n);
message += strlen(I3_IPC_MAGIC);
n -= strlen(I3_IPC_MAGIC);
/* The next 32 bit after the magic are the message size */
uint32_t message_size = *((uint32_t*)message);
message += sizeof(uint32_t);
n -= sizeof(uint32_t);
if (message_size > n) {
DLOG("IPC: Either the message size was wrong or the message was not read completely, dropping\n");
return;
} }
if (strncmp(buf, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC)) != 0) { /* The last 32 bits of the header are the message type */
DLOG("IPC: message does not start with the IPC magic\n"); uint32_t message_type = *((uint32_t*)message);
return; message += sizeof(uint32_t);
} n -= sizeof(uint32_t);
uint8_t *message = (uint8_t*)buf; if (message_type >= (sizeof(handlers) / sizeof(handler_t)))
while (n > 0) { DLOG("Unhandled message type: %d\n", message_type);
DLOG("IPC: n = %d\n", n); else {
message += strlen(I3_IPC_MAGIC); handler_t h = handlers[message_type];
n -= strlen(I3_IPC_MAGIC); h(w->fd, message, n, message_size, message_type);
/* The next 32 bit after the magic are the message size */
uint32_t message_size = *((uint32_t*)message);
message += sizeof(uint32_t);
n -= sizeof(uint32_t);
if (message_size > n) {
DLOG("IPC: Either the message size was wrong or the message was not read completely, dropping\n");
return;
}
/* The last 32 bits of the header are the message type */
uint32_t message_type = *((uint32_t*)message);
message += sizeof(uint32_t);
n -= sizeof(uint32_t);
if (message_type >= (sizeof(handlers) / sizeof(handler_t)))
DLOG("Unhandled message type: %d\n", message_type);
else {
handler_t h = handlers[message_type];
h(w->fd, message, n, message_size, message_type);
}
n -= message_size;
message += message_size;
} }
n -= message_size;
message += message_size;
}
} }
/* /*
@ -553,28 +552,28 @@ static void ipc_receive_message(EV_P_ struct ev_io *w, int revents) {
* *
*/ */
void ipc_new_client(EV_P_ struct ev_io *w, int revents) { void ipc_new_client(EV_P_ struct ev_io *w, int revents) {
struct sockaddr_un peer; struct sockaddr_un peer;
socklen_t len = sizeof(struct sockaddr_un); socklen_t len = sizeof(struct sockaddr_un);
int client; int client;
if ((client = accept(w->fd, (struct sockaddr*)&peer, &len)) < 0) { if ((client = accept(w->fd, (struct sockaddr*)&peer, &len)) < 0) {
if (errno == EINTR) if (errno == EINTR)
return; return;
else perror("accept()"); else perror("accept()");
return; return;
} }
set_nonblock(client); set_nonblock(client);
struct ev_io *package = scalloc(sizeof(struct ev_io)); struct ev_io *package = scalloc(sizeof(struct ev_io));
ev_io_init(package, ipc_receive_message, client, EV_READ); ev_io_init(package, ipc_receive_message, client, EV_READ);
ev_io_start(EV_A_ package); ev_io_start(EV_A_ package);
DLOG("IPC: new client connected\n"); DLOG("IPC: new client connected\n");
ipc_client *new = scalloc(sizeof(ipc_client)); ipc_client *new = scalloc(sizeof(ipc_client));
new->fd = client; new->fd = client;
TAILQ_INSERT_TAIL(&all_clients, new, clients); TAILQ_INSERT_TAIL(&all_clients, new, clients);
} }
/* /*
@ -583,44 +582,44 @@ void ipc_new_client(EV_P_ struct ev_io *w, int revents) {
* *
*/ */
int ipc_create_socket(const char *filename) { int ipc_create_socket(const char *filename) {
int sockfd; int sockfd;
char *resolved = resolve_tilde(filename); char *resolved = resolve_tilde(filename);
DLOG("Creating IPC-socket at %s\n", resolved); DLOG("Creating IPC-socket at %s\n", resolved);
char *copy = sstrdup(resolved); char *copy = sstrdup(resolved);
const char *dir = dirname(copy); const char *dir = dirname(copy);
if (!path_exists(dir)) if (!path_exists(dir))
mkdirp(dir); mkdirp(dir);
free(copy); free(copy);
/* Unlink the unix domain socket before */ /* Unlink the unix domain socket before */
unlink(resolved); unlink(resolved);
if ((sockfd = socket(AF_LOCAL, SOCK_STREAM, 0)) < 0) {
perror("socket()");
free(resolved);
return -1;
}
(void)fcntl(sockfd, F_SETFD, FD_CLOEXEC);
struct sockaddr_un addr;
memset(&addr, 0, sizeof(struct sockaddr_un));
addr.sun_family = AF_LOCAL;
strncpy(addr.sun_path, resolved, sizeof(addr.sun_path) - 1);
if (bind(sockfd, (struct sockaddr*)&addr, sizeof(struct sockaddr_un)) < 0) {
perror("bind()");
free(resolved);
return -1;
}
if ((sockfd = socket(AF_LOCAL, SOCK_STREAM, 0)) < 0) {
perror("socket()");
free(resolved); free(resolved);
set_nonblock(sockfd); return -1;
}
if (listen(sockfd, 5) < 0) { (void)fcntl(sockfd, F_SETFD, FD_CLOEXEC);
perror("listen()");
return -1;
}
return sockfd; struct sockaddr_un addr;
memset(&addr, 0, sizeof(struct sockaddr_un));
addr.sun_family = AF_LOCAL;
strncpy(addr.sun_path, resolved, sizeof(addr.sun_path) - 1);
if (bind(sockfd, (struct sockaddr*)&addr, sizeof(struct sockaddr_un)) < 0) {
perror("bind()");
free(resolved);
return -1;
}
free(resolved);
set_nonblock(sockfd);
if (listen(sockfd, 5) < 0) {
perror("listen()");
return -1;
}
return sockfd;
} }