Changeset 4783Tweet

Timestamp:

Jun 25, 2011, 12:08:51 PM (11 years ago)

Author:

Sam Hocevar

Message:

mini: tweak stuff in the mini server / mini client test programs.

Location:

neercs/trunk/src

Files:

• mini-client.c (modified) (2 diffs)
• mini-server.c (modified) (3 diffs)
• mini-socket.c (modified) (9 diffs)

neercs/trunk/src/mini-client.c

@@ -1 +1 @@
 /*
  *  neercs        console-based window manager
- *  Copyright (c) 2006-2010 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2006-2011 Sam Hocevar <sam@hocevar.net>
  *                2008-2010 Jean-Yves Lamoureux <jylam@lnxscene.org>
  *                2008-2010 Pascal Terjan <pterjan@linuxfr.org>
@@ -69 +69 @@
         {
             fprintf(stderr, "neercs: connection established\n");
+socket_puts(insock, "TEST insock");
         }
     }

neercs/trunk/src/mini-server.c

@@ -1 +1 @@
 /*
  *  neercs        console-based window manager
- *  Copyright (c) 2006-2010 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2006-2011 Sam Hocevar <sam@hocevar.net>
  *                2008-2010 Jean-Yves Lamoureux <jylam@lnxscene.org>
  *                2008-2010 Pascal Terjan <pterjan@linuxfr.org>
@@ -27 +27 @@
 void server_init(void)
 {
+while (!insock)
     insock = socket_open("/tmp/neercs.sock", 1);
 }
@@ -35 +36 @@
     ssize_t bytes;
     int ret;
+
+    if (outsock)
+    {
+        ret = socket_select(outsock, 1000);
+        if (ret <= 0)
+            goto nothing;
+
+        bytes = socket_read(outsock, buf, BUFSIZ);
+        if (bytes <= 0)
+            goto nothing;
+    }
+nothing:
 
     ret = socket_select(insock, 1000);

neercs/trunk/src/mini-socket.c

@@ -1 +1 @@
 /*
  *  neercs        console-based window manager
- *  Copyright (c) 2006-2010 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2006-2011 Sam Hocevar <sam@hocevar.net>
  *                2008-2010 Jean-Yves Lamoureux <jylam@lnxscene.org>
  *                2008-2010 Pascal Terjan <pterjan@linuxfr.org>
@@ -26 +26 @@
 #include <sys/socket.h> /* bind(), connect() */
 #include <sys/un.h> /* AF_UNIX */
+#include <errno.h> /* AF_UNIX */
+#include <time.h> /* time */
 
 #include "mini-neercs.h"
@@ -31 +33 @@
 
 #define SIZEOF_SUN_PATH (sizeof(((struct sockaddr_un *)NULL)->sun_path))
+
+#define offsetof(s, f) ((int)(intptr_t)((s *)NULL)->f)
 
 struct nrx_socket
@@ -38 +42 @@
     int fd;
     int server;
+    int connected;
     char path[SIZEOF_SUN_PATH];
 #else
@@ -44 +49 @@
 };
 
+#define QLEN 10
+
+int
+serv_listen(const char *name)
+{
+    int                 fd, len, err, rval;
+    struct sockaddr_un  un;
+
+    /* create a UNIX domain stream socket */
+    if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+       return(-1);
+    unlink(name);   /* in case it already exists */
+
+    /* fill in socket address structure */
+    memset(&un, 0, sizeof(un));
+    un.sun_family = AF_UNIX;
+    strcpy(un.sun_path, name);
+    len = offsetof(struct sockaddr_un, sun_path) + strlen(name);
+
+    /* bind the name to the descriptor */
+    if (bind(fd, (struct sockaddr *)&un, len) < 0) {
+        rval = -2;
+        goto errout;
+    }
+    if (listen(fd, QLEN) < 0) { /* tell kernel we're a server */
+        rval = -3;
+        goto errout;
+    }
+    return(fd);
+
+errout:
+    err = errno;
+    close(fd);
+    errno = err;
+    return(rval);
+}
+
+#define STALE   30  /* client's name can't be older than this (sec) */
+
+/*
+ * Wait for a client connection to arrive, and accept it.
+ * We also obtain the client's user ID from the pathname
+ * that it must bind before calling us.
+ * Returns new fd if all OK, <0 on error
+ */
+int
+serv_accept(int listenfd, uid_t *uidptr)
+{
+    int                 clifd, len, err, rval;
+    time_t              staletime;
+    struct sockaddr_un  un;
+    struct stat         statbuf;
+
+    len = sizeof(un);
+    if ((clifd = accept(listenfd, (struct sockaddr *)&un, &len)) < 0)
+        return(-1);     /* often errno=EINTR, if signal caught */
+
+    /* obtain the client's uid from its calling address */
+    len -= offsetof(struct sockaddr_un, sun_path); /* len of pathname */
+    un.sun_path[len] = 0;           /* null terminate */
+
+    if (stat(un.sun_path, &statbuf) < 0) {
+        rval = -2;
+        goto errout;
+    }
+#ifdef S_ISSOCK     /* not defined for SVR4 */
+    if (S_ISSOCK(statbuf.st_mode) == 0) {
+        rval = -3;      /* not a socket */
+        goto errout;
+    }
+#endif
+    if ((statbuf.st_mode & (S_IRWXG | S_IRWXO)) ||
+        (statbuf.st_mode & S_IRWXU) != S_IRWXU) {
+          rval = -4;     /* is not rwx------ */
+          goto errout;
+    }
+
+    staletime = time(NULL) - STALE;
+    if (statbuf.st_atime < staletime ||
+        statbuf.st_ctime < staletime ||
+        statbuf.st_mtime < staletime) {
+          rval = -5;    /* i-node is too old */
+          goto errout;
+    }
+    if (uidptr != NULL)
+        *uidptr = statbuf.st_uid;   /* return uid of caller */
+    unlink(un.sun_path);        /* we're done with pathname now */
+    return(clifd);
+
+errout:
+    err = errno;
+    close(clifd);
+    errno = err;
+    return(rval);
+}
+
+#define CLI_PATH    "/var/tmp/"      /* +5 for pid = 14 chars */
+#define CLI_PERM    S_IRWXU          /* rwx for user only */
+
+/*
+ * Create a client endpoint and connect to a server.
+ * Returns fd if all OK, <0 on error.
+ */
+int
+cli_conn(const char *name)
+{
+    int                fd, len, err, rval;
+    struct sockaddr_un un;
+
+    /* create a UNIX domain stream socket */
+    if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+        return(-1);
+
+    /* fill socket address structure with our address */
+    memset(&un, 0, sizeof(un));
+    un.sun_family = AF_UNIX;
+    sprintf(un.sun_path, "%s%05d", CLI_PATH, getpid());
+    len = offsetof(struct sockaddr_un, sun_path) + strlen(un.sun_path);
+
+    unlink(un.sun_path);        /* in case it already exists */
+    if (bind(fd, (struct sockaddr *)&un, len) < 0) {
+        rval = -2;
+        goto errout;
+    }
+    if (chmod(un.sun_path, CLI_PERM) < 0) {
+        rval = -3;
+        goto errout;
+    }
+    /* fill socket address structure with server's address */
+    memset(&un, 0, sizeof(un));
+    un.sun_family = AF_UNIX;
+    strcpy(un.sun_path, name);
+    len = offsetof(struct sockaddr_un, sun_path) + strlen(name);
+    if (connect(fd, (struct sockaddr *)&un, len) < 0) {
+        rval = -4;
+        goto errout;
+    }
+    return(fd);
+
+errout:
+    err = errno;
+    close(fd);
+    errno = err;
+    return(rval);
+}
+
 nrx_socket_t * socket_open(char const *path, int server)
 {
@@ -50 +201 @@
     int ret, fd;
 
-    fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+#if 0
+    fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    //fd = socket(AF_UNIX, SOCK_DGRAM, 0);
     if (fd < 0)
     {
@@ -79 +232 @@
 
     fcntl(fd, F_SETFL, O_NONBLOCK);
+#endif
+if (server)
+    fd = serv_listen(path);
+else
+    fd = cli_conn(path);
+if (fd < 0) return NULL;
 
     sock = malloc(sizeof(*sock));
     sock->fd = fd;
     sock->server = server;
+    sock->connected = 0;
     strncpy(sock->path, path, SIZEOF_SUN_PATH - 1);
 
@@ -113 +273 @@
 {
     int ret;
+fprintf(stderr, "pid %i sending %i bytes on %s: %s\n", getpid(), (int)strlen(str), sock->path, str);
     ret = write(sock->fd, str, strlen(str));
     return ret;
@@ -121 +282 @@
     int ret;
     ret = read(sock->fd, buf, count);
+if (ret >= 0) ((char *)buf)[ret] = 0;
+if (ret >= 0) fprintf(stderr, "pid %i recving %i bytes on %s: %s\n", getpid(), ret, sock->path, (char *)buf);
     return ret;
 }