Changeset 2474

Timestamp:

06/22/08 11:57:21 (5 years ago)

Author:

pterjan

Message:

• First more or less working version of attach

Location:

neercs/trunk/src

Files:

• attach.c (modified) (3 diffs)
• configuration.c (modified) (1 diff)
• effects.c (modified) (2 diffs)
• main.c (modified) (11 diffs)
• neercs.h (modified) (3 diffs)

neercs/trunk/src/attach.c

@@ +1 @@
+#include <errno.h>
 #include <fcntl.h>
+#include <glob.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #include "neercs.h"
+
+static char * build_socket_path(char *socket_dir)
+{
+    char *path, *dir;
+    path = (char *)malloc(PATH_MAX+1);
+    dir = socket_dir;
+    if(!dir)
+        dir = getenv("NEERCSDIR");
+    if(!dir)
+        dir = getenv("TMPDIR");
+    if(!dir)
+        dir = "/tmp";
+    if(path)
+        snprintf(path, PATH_MAX+1, "%s/neercs.%d.sock", dir, getpid());
+    return path;
+}
+
+int create_socket(struct screen_list* screen_list)
+{
+    int sock;
+    struct sockaddr_un myaddr;
+
+    sock = socket(AF_UNIX, SOCK_DGRAM, 0);
+
+    if(sock < 0)
+    {
+        perror("create_socket:socket");
+        return errno;
+    }
+
+    memset(&myaddr, 0, sizeof(struct sockaddr_un));
+
+    myaddr.sun_family = AF_UNIX;
+    screen_list->socket_path = build_socket_path(screen_list->socket_path);
+    strncpy(myaddr.sun_path, screen_list->socket_path, sizeof(myaddr.sun_path) - 1);
+    unlink(myaddr.sun_path);
+
+    if(bind(sock, (struct sockaddr *)&myaddr, sizeof(struct sockaddr_un)) < 0)
+    {
+        free(screen_list->socket_path);
+        screen_list->socket_path = NULL;
+        close(sock);
+        perror("create_socket:bind");
+        return errno;
+    }
+    fcntl(sock, F_SETFL, O_NONBLOCK);
+
+    debug("Listening on %s (%d)", screen_list->socket_path, sock);
+
+    screen_list->socket = sock;
+
+    return 0;
+}
 
 int detach(struct screen_list* screen_list, caca_display_t * dp)
@@ -13 +74 @@
     screen_list->attached = 0;
     caca_free_display(dp);
-
-    pid = fork();
-    if (pid < 0)
-        return 1;
-    if (pid > 0)
-        exit(0);
 
     close(0);
     close(1);
     close(2);
-    fd = open("/dev/null", O_RDWR);
+
+    fd = open("/tmp/log.txt", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
     dup2(fd, 0);
     dup2(fd, 1);
@@ -30 +86 @@
         close(fd);
 
-    setsid();
+    if(!screen_list->socket)
+    {
+        pid = fork();
+        if (pid < 0)
+            return 1;
+        if (pid > 0)
+            exit(0);
+
+        create_socket(screen_list);
+        setsid();
+    }
 
     return 0;
 }
 
-#if 0
-int attach(struct screen_list* screen_list, cucul_canvas_t * cv, caca_display_t ** dp)
-{
-    screen_list->attached = 1;
-    *dp = caca_create_display(cv);
-    if(!*dp)
+/* FIXME Is this really not defined anywhere ? */
+#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
+
+static int handle_command(char * cmd, struct screen_list* screen_list, cucul_canvas_t * cv, caca_display_t ** dp)
+{
+    int refresh = 0;
+    debug("Received command %s", cmd);
+    if(!strncmp("ENV ", cmd, MIN(4, strlen(cmd))))
+    {
+        putenv(strdup(cmd+4));
+    }
+    else if(!strncmp("ATTACH ", cmd, MIN(7, strlen(cmd))))
+    {
+        int fd;
+        screen_list->attached = 1;
+        close(screen_list->socket);
+        screen_list->socket= 0;
+        unlink(screen_list->socket_path);
+        screen_list->socket_path = NULL;
+        close(0);
+        fd=open(cmd+7, O_RDWR);
+        dup2(fd, 0);
+        close(1);
+        fd=open(cmd+7, O_RDWR);
+        dup2(fd, 1);
+        close(2);
+        fd=open(cmd+7, O_RDWR);
+        dup2(fd, 2);
+        *dp = caca_create_display(cv);
+        if(*dp)
+        {
+            caca_set_cursor(*dp, 1);
+            refresh = 1;
+        }
+    }
+    else
+    {
+        fprintf(stderr, "Unknown command received: %s\n", cmd);
+    }
+    return refresh;
+}
+
+int read_socket(struct screen_list* screen_list, cucul_canvas_t * cv, caca_display_t ** dp) {
+    ssize_t n;
+    char buf[4097];
+    int refresh = 0;
+
+    if(!screen_list->socket)
+        return 0;
+
+    while (screen_list->socket && (n = read(screen_list->socket, buf, sizeof(buf)-1)) > 0)
+    {
+        buf[n] = 0;
+        refresh |= handle_command(buf, screen_list, cv, dp);
+    }
+    return refresh;
+}
+
+char ** list_sockets(char *socket_dir)
+{
+    char *pattern, *dir;
+    glob_t globbuf;
+
+    globbuf.gl_pathv = NULL;
+
+    pattern = (char *)malloc(PATH_MAX+1);
+
+    dir = socket_dir;
+    if(!dir)
+        dir = getenv("NEERCSDIR");
+    if(!dir)
+        dir = getenv("TMPDIR");
+    if(!dir)
+        dir = "/tmp";
+
+    if(!pattern)
+        return globbuf.gl_pathv;
+
+    snprintf(pattern, PATH_MAX, "%s/neercs.*.sock", dir);
+    pattern[PATH_MAX] = '\0';
+
+    debug("Looking for sockets in the form %s", pattern);
+
+    glob(pattern, 0, NULL, &globbuf);
+
+    return globbuf.gl_pathv;
+}
+
+
+/* FIXME Is this really not defined anywhere ? */
+extern char **environ;
+
+int request_attach(char *socket_path)
+{
+    int i;
+    int sock;
+    char fdstr[PATH_MAX], lnk[PATH_MAX];
+    char buf[4096];
+    struct sockaddr_un addr;
+
+    debug("Connecting to %s", socket_path);
+
+    /* Open the socket */
+    if ((sock = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) {
+        perror("request_attach:socket");
         return 1;
-
-    caca_set_cursor(*dp, 1);
-    return 0;
-}
-#endif
+    }
+
+    memset(&addr,0,sizeof(addr));
+    addr.sun_family = AF_UNIX;
+    strcpy(addr.sun_path,socket_path);
+    if (connect(sock, &addr, sizeof(addr)) < 0)
+    {
+        perror("request_attach:connect");
+        return 1;
+    }
+
+    debug("Sending environment", 0);
+
+    /* Send our environment */
+    for(i=0; environ[i]; i++)
+    {
+        snprintf(buf, 4096, "ENV %s", environ[i]);
+        write(sock, buf, strlen(buf));
+    }
+
+    snprintf(fdstr, sizeof(fdstr), "/proc/%d/fd/0", getpid());
+    readlink(fdstr, lnk, sizeof(lnk)-1);
+    lnk[PATH_MAX-1] = '\0';
+
+    close(0);
+
+    debug("Requesting attach to %s", lnk);
+
+    /* Request attaching */
+    snprintf(buf, 4096, "ATTACH %s", lnk);
+    write(sock, buf, strlen(buf));
+    close(sock);
+
+    debug("Exiting", 0);
+    exit(0);
+}

neercs/trunk/src/configuration.c

@@ -283 +283 @@
             /* if timeout is 0, set it to 0xFFFFFFFFFFFFFFFF */
             if(!screen_list->screensaver_timeout) screen_list->screensaver_timeout-=1;
+        } else if(IS_TOKEN("socket_dir"))
+        {
+            screen_list->socket_dir = option->value;
         } else
         {
-            fprintf(stderr, "Unknow option '%s'\n", option->key);
+            fprintf(stderr, "Unknown option '%s'\n", option->key);
         }
         option = option->next;

neercs/trunk/src/effects.c

@@ -201 +201 @@
     cucul_printf(cv, x, y++, "              Sam Hocevar <sam@zoy.org>");
     cucul_printf(cv, x, y++, "              Jean-Yves Lamoureux <jylam@lnxscene.org>");
+    cucul_printf(cv, x, y++, "              Pascal Terjan <pterjan@linuxfr.org>");
     cucul_printf(cv, x, y++, "");
     cucul_printf(cv, x, y++, "");
@@ -209 +210 @@
     cucul_printf(cv, x, y++, "c:\t Create new window");
     cucul_printf(cv, x, y++, "m:\t Thumbnails");
+    cucul_printf(cv, x, y++, "d:\t Detach");
     cucul_printf(cv, x, y++, "k:\t Close window and kill associated process");
     cucul_printf(cv, x, y++, "h:\t This help");
-    cucul_printf(cv, x, y++, "");
     cucul_printf(cv, x, y++, "");
     cucul_printf(cv, x, y++, "");

neercs/trunk/src/main.c

@@ -71 +71 @@
     printf("Options :\n");
     printf("\t--pid\t\t-P <pid>\t\tattach <pid>\n");
+    printf("\t\t\t-R\t\t\tre-attach another neercs\n");
     printf("\t--version\t-v \t\t\tdisplay version and exit\n");
     printf("\t--help\t\t-h \t\t\tthis help\n");
@@ -86 +87 @@
     long long unsigned int last_key_time = 0;
     int lock_offset = 0;
-
+    int mainret = 0;
 
     default_shell = getenv("SHELL");
@@ -101 +102 @@
 
     /* Create main canvas and associated caca window */
+    /* FIXME: do not create display for -R/-h/-v */
     cv = cucul_create_canvas(0, 0);
     dp = caca_create_display(cv);
@@ -141 +143 @@
     screen_list->locked = 0;
     screen_list->attached = 1;
+    screen_list->socket = 0;
+    screen_list->socket_dir = NULL;
+    screen_list->socket_path = NULL;
     memset(screen_list->lockmsg, 0, 1024);
     memset(screen_list->lockpass, 0, 1024);
-
 
     if(!read_configuration_file("neercs.ini", screen_list))
@@ -169 +173 @@
     {
         int option_index = 0;
+        char **sockets;
+        int grab = 0;
         static struct myoption long_options[] =
             {
@@ -178 +184 @@
             };
 #if defined USE_GRAB
-        int c = mygetopt(argc, argv, "P:hv", long_options, &option_index);
+        int c = mygetopt(argc, argv, "RP:hv", long_options, &option_index);
 #else
-        int c = mygetopt(argc, argv, "hv", long_options, &option_index);
+        int c = mygetopt(argc, argv, "Rhv", long_options, &option_index);
 #endif
         if(c == -1)
@@ -190 +196 @@
             add_screen(screen_list,create_screen_grab(w, h, atoi(myoptarg)));
             s+=2;
+            grab = 1;
+            break;
+        case 'R':
+            if(grab)
+            {
+                fprintf(stderr, "-P and -R can not be used together!\n");
+                mainret = -1;
+                goto end;
+            }
+            sockets = list_sockets(screen_list->socket_dir);
+            if(sockets && sockets[0])
+            {
+                request_attach(sockets[0]);
+                for(i=0; sockets[i]; i++)
+                    free(sockets[i]);
+                free(sockets);
+            }
+            goto end;
             break;
         case 'h': /* --help */
             usage(argc, argv);
-            return 0;
+            goto end;
             break;
         case 'v': /* --version */
@@ -200 +224 @@
             break;
         default:
-            fprintf(stderr, "Unknow argument #%d\n", myoptind);
-            return -1;
+            fprintf(stderr, "Unknown argument #%d\n", myoptind);
+            mainret = -1;
+            goto end;
             break;
         }
@@ -233 +258 @@
 
         refresh |= update_screens_contents(screen_list);
+
+        refresh |= read_socket(screen_list, cv, &dp);
 
         /* No more screens, exit */
@@ -510 +537 @@
     }
 
+    if(screen_list->socket_path) {
+        unlink(screen_list->socket_path);
+        free(screen_list->socket_path);
+    }
+    if(screen_list->socket)
+        close(screen_list->socket);
+
     free(screen_list->screen);
 
@@ -536 +570 @@
     free(recurrent_list);
 
-    return 0;
+    return mainret;
 }
 

neercs/trunk/src/neercs.h

@@ -27 +27 @@
 };
 
-
 struct option
 {
@@ -71 +70 @@
     int in_bell;                 /* Bell occuring in a window  */
     int dont_update_coords;      /* Used by recurrents */
+
+    /* Detaching */
     int attached;                /* Are we attached to a terminal */
+    int socket;                  /* Socket to ask for attaching */
+    char *socket_path;           /* Socket to ask for attaching */
+    char *socket_dir;            /* Where to create the socket */
 
     /* Lock */
@@ -133 +137 @@
 
 int detach(struct screen_list* screen_list, caca_display_t * dp);
+int request_attach(char *socket_path);
+int create_socket(struct screen_list* screen_list);
+int read_socket(struct screen_list* screen_list, cucul_canvas_t * cv, caca_display_t ** dp);
+char ** list_sockets(char *socket_dir);
 
 /* Screens management */