pex: Actually try to close server endpoints

apps/toastd.c

@@ -121,11 +121,13 @@ int main(int argc, char * argv[]) {
 		yctx = yutani_init();
 		if (!yctx) {
 			fprintf(stderr, "%s: Failed to connect to compositor.\n", argv[0]);
+			return 1;
 		}
 		/* Open pex endpoint to receive notifications... */
 		pex_endpoint = pex_bind("toast");
 		if (!pex_endpoint) {
 			fprintf(stderr, "%s: Failed to establish socket.\n", argv[0]);
+			return 1;
 		}
 		/* Set up our text rendering and sprite contexts... */
 		markup_text_init();

base/usr/include/fcntl.h

@@ -43,8 +43,10 @@ struct flock {
 
 #define FD_CLOEXEC (1 << 0)
 
+#ifndef __kernel__
 extern int open (const char *, int, ...);
 extern int chmod(const char *path, mode_t mode);
 extern int fcntl(int fd, int cmd, ...);
+#endif
 
 _End_C_Header

base/usr/include/kernel/vfs.h

@@ -11,17 +11,7 @@
 #define PATH_UP  ".."
 #define PATH_DOT "."
 
-#define O_RDONLY     0x0000
-#define O_WRONLY     0x0001
-#define O_RDWR       0x0002
-#define O_APPEND     0x0008
-#define O_CREAT      0x0200
-#define O_TRUNC      0x0400
-#define O_EXCL       0x0800
-#define O_NOFOLLOW   0x1000
-#define O_PATH       0x2000
-#define O_NONBLOCK   0x4000
-#define O_DIRECTORY  0x8000
+#include <fcntl.h>
 
 #define FS_FILE        0x01
 #define FS_DIRECTORY   0x02

kernel/vfs/packetfs.c

@@ -48,6 +48,7 @@ typedef struct packet_exchange {
 	spin_lock_t lock;
 	fs_node_t * server_pipe;
 	list_t * clients;
+	pex_t * parent;
 } pex_ex_t;
 
 typedef struct packet_client {
@@ -191,7 +192,7 @@ static ssize_t read_client(fs_node_t * node, off_t offset, size_t size, uint8_t
 	pex_client_t * c = (pex_client_t *)node->inode;
 	if (c->parent != node->device) {
 		printf("pex: Invalid device endpoint on client read?\n");
-		return -1;
+		return -EINVAL;
 	}
 
 	debug_print(INFO, "[pex] client read(...)");
@@ -200,11 +201,11 @@ static ssize_t read_client(fs_node_t * node, off_t offset, size_t size, uint8_t
 
 	receive_packet(c->parent, c->pipe, &packet);
 
-	if (!packet) return -1;
+	if (!packet) return -EIO;
 
 	if (packet->size > size) {
 		printf("pex: Client is not reading enough bytes to hold packet of size %zu\n", packet->size);
-		return -1;
+		return -EINVAL;
 	}
 
 	memcpy(buffer, &packet->data, packet->size);
@@ -223,14 +224,14 @@ static ssize_t write_client(fs_node_t * node, off_t offset, size_t size, uint8_t
 	pex_client_t * c = (pex_client_t *)node->inode;
 	if (c->parent != node->device) {
 		debug_print(WARNING, "[pex] Invalid device endpoint on client write?");
-		return -1;
+		return -EINVAL;
 	}
 
 	debug_print(INFO, "[pex] client write(...)");
 
 	if (size > MAX_PACKET_SIZE) {
 		debug_print(WARNING, "Size of %lu is too big.", size);
-		return -1;
+		return -EINVAL;
 	}
 
 	debug_print(INFO, "Sending packet of size %lu to parent", size);
@@ -291,23 +292,58 @@ static int check_client(fs_node_t * node) {
 	return selectcheck_fs(c->pipe);
 }
 
+
+static void close_server(fs_node_t * node) {
+	pex_ex_t * ex = (pex_ex_t *)node->device;
+	pex_t * p = ex->parent;
+
+	spin_lock(p->lock);
+
+	node_t * lnode = list_find(p->exchanges, ex);
+
+	/* Remove from exchange list */
+	if (lnode) {
+		list_delete(p->exchanges, lnode);
+		free(lnode);
+	}
+
+	/* Tell all clients we have disconnected */
+	spin_lock(ex->lock);
+	foreach(f, ex->clients) {
+		pex_client_t * client = (pex_client_t*)f->value;
+		send_to_client(ex, client, 0, NULL);
+		client->parent = NULL;
+	}
+	spin_unlock(ex->lock);
+
+	/* TODO Free resources */
+
+
+	spin_unlock(p->lock);
+
+}
+
 static void open_pex(fs_node_t * node, unsigned int flags) {
 	pex_ex_t * t = (pex_ex_t *)(node->device);
 
 	debug_print(NOTICE, "Opening packet exchange %s with flags 0x%x", t->name, flags);
 
-	if (flags & O_CREAT && t->fresh) {
+	if ((flags & O_CREAT) && (flags & O_EXCL)) {
+		if (!t->fresh) {
+			return; /* Address in use; this should be handled by kopen... */
+		}
 		t->fresh = 0;
 		node->inode = 0;
 		/* Set up the server side */
 		node->read   = read_server;
 		node->write  = write_server;
 		node->ioctl  = ioctl_server;
+		node->close  = close_server;
 		node->selectcheck = check_server;
 		node->selectwait  = wait_server;
 		debug_print(INFO, "[pex] Server launched: %s", t->name);
 		debug_print(INFO, "fs_node = %p", (void*)node);
-	} else if (!(flags & O_CREAT)) {
+	} else {
 		pex_client_t * client = create_client(t);
 		node->inode = (uintptr_t)client;
 
@@ -323,8 +359,6 @@ static void open_pex(fs_node_t * node, unsigned int flags) {
 
 		/* XXX: Send plumbing message to server for new client connection */
 		debug_print(INFO, "[pex] Client connected: %s:%lx", t->name, node->inode);
-	} else if (flags & O_CREAT && !t->fresh) {
-		/* XXX: You dun goofed */
 	}
 
 	return;
@@ -437,6 +471,7 @@ static int create_packetfs(fs_node_t *parent, char *name, mode_t permission) {
 	new_exchange->fresh = 1;
 	new_exchange->clients = list_create("pex clients",new_exchange);
 	new_exchange->server_pipe = make_pipe(4096);
+	new_exchange->parent = p;
 
 	spin_init(new_exchange->lock);
 	/* XXX Create exchange server pipe */

lib/pex.c

@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <sys/ioctl.h>
 
 #include <toaru/pex.h>
@@ -61,7 +62,11 @@ FILE * pex_bind(char * target) {
 	char tmp[100];
 	if (strlen(target) > 80) return NULL;
 	sprintf(tmp, "/dev/pex/%s", target);
-	FILE * out = fopen(tmp, "a+");
+	int fd = open(tmp, O_CREAT | O_EXCL | O_RDWR | O_APPEND);
+	if (fd < 0) {
+		return NULL;
+	}
+	FILE * out = fdopen(fd, "a+");
 	if (out) {
 		setbuf(out, NULL);
 	}