@@ -23,6 +23,7 @@

 #include <sys/select.h>

 #include <stdarg.h>

 #include <sys/stat.h>

+#include <limits.h>

 #include "re_data.h"

 #include "re_plugin_unsaved.h"

@@ -43,6 +44,7 @@

 #define COMMBUFSIZE 16384

 #define COMMCLIENTSBLOCKSIZE 32

 #define SOCKETFILENAMESIZE 1024

+#define MAXFILENAMESIZE PATH_MAX+1

 #define LISTENBACKLOG 5

 #define VIEWONLYPROGNAME "review"

@@ -181,6 +183,8 @@ typedef struct theme_t {

 typedef struct commclient_t {

         int fd;

+        int flag_connectedtoserver;

+        char remoteid[MAXFILENAMESIZE];

         int sizebufin;

         int usedbufin;

         int gotbufin;

@@ -193,6 +197,7 @@ typedef struct commclient_t {

 typedef struct comms_t {

         int serverfd;

+        char id[MAXFILENAMESIZE];

         char socketfilename[SOCKETFILENAMESIZE];

         int sizeclients;

         int usedclients;

@@ -294,7 +299,7 @@ int re_wheelaccel(re_t *re, int rawamount);

 int re_themeset(re_t *re, int ntheme);

 int re_socketinit(re_t *re, char *filename);

 void re_socketfree(re_t *re);

-int re_socketnewclient(re_t *re);

+int re_socketnewclient(re_t *re, int alreadyacceptedfd);

 int re_socketstep(re_t *re);

 int re_socketin(re_t *re, int nclient, char *line);

 #ifndef __GNUC__

@@ -2982,6 +2987,13 @@ re_socketinit(re_t *re,char *filename)

                 }

                 re->comms.usedclients=0;

         }

+        /* fill the id */

+        if(realpath(filename,re->comms.id)==NULL) {

+                /* if the path cannot be resolved, copy the filename */

+                strncpy(re->comms.id,filename,sizeof(re->comms.id));

+                re->comms.id[sizeof(re->comms.id)-1]='\0';

+        }

+        re->comms.id[sizeof(re->comms.id)-1]='\0';

         /* prepare the new filepath for the socket */

         if((passwd=getpwuid(getuid()))==NULL || (username=passwd->pw_name)==NULL) {

                 fprintf(stderr,"WARNING: Couldn't get username\n");

@@ -3000,16 +3012,39 @@ re_socketinit(re_t *re,char *filename)

                 return(-1);

         }

         /* detect if there is a stale socket */

-        if((oldfd=open(comms->socketfilename, O_WRONLY|O_APPEND))!=-1) {

+        if((errstr="create")==NULL

+          || (oldfd=socket(AF_UNIX,SOCK_STREAM,0))==-1

+          || (errstr="assing")==NULL /* this one never fails, just for completion */

+          || (memset(&addr,0,sizeof(struct sockaddr_un)))==NULL

+          || (addr.sun_family=AF_UNIX)!=AF_UNIX

+          || strncpy(addr.sun_path,comms->socketfilename,sizeof(addr.sun_path))==NULL

+          || (errstr="connect")==NULL

+          || connect(oldfd,(struct sockaddr *)&addr,sizeof(addr))==-1

+        ) {

+#if 0

+fprintf(stderr,"Check for other server result: %s fail.\n",errstr);

+#endif

+                close(oldfd),oldfd=-1; /* OK: the re is no server as couldn't connect */

+        } else {

                 fd_set writeset;

                 struct timeval tv;

                 FD_ZERO(&writeset);

                 FD_SET(oldfd,&writeset);

                 tv.tv_sec=tv.tv_usec=0;

                 if(select(oldfd+1,NULL,&writeset,NULL,&tv)>0) {

+                        int nclient;

                         comms->socketfilename[0]='\0';

-                        fprintf(stderr,"WARNING: There is a process using the communication socket for the file\n");

-#warning TODO: if the unix domain socket is in use, connect to it and warn that I''m also able to service that filename, so (1) it forwards the petitions, and (2) be waware of when the other process quits to retake control of the unix domain socket

+                        nclient=re_socketnewclient(re,oldfd),oldfd=-1;

+                        if(nclient!=-1) {

+                                re_socketout(re,nclient,"id %s\n",comms->id);

+                                comms->clients[nclient]->flag_connectedtoserver=1;

+#if 0

+fprintf(stderr,"nclient:%i id:\"%s\".\n",nclient,comms->id);

+fprintf(stderr,"Connected to server.\n");

+#endif

+                                return(0);

+                        }

+                        fprintf(stderr,"WARNING: There is a process using the communication socket for the file and couldn't connect to it.\n");

                         return(-1);

                 }

                 close(oldfd),oldfd=-1;

@@ -3033,7 +3068,7 @@ re_socketinit(re_t *re,char *filename)

                 fprintf(stderr,"WARNING: Couldn't %s unix domain socket\n",errstr);

                 return(-1);

         }

-#if 1

+#if 0

 fprintf(stderr,"Server registered.\n");

 #endif

         return(0);

@@ -3066,7 +3101,7 @@ re_socketfree(re_t *re)

 }

 int

-re_socketnewclient(re_t *re)

+re_socketnewclient(re_t *re, int alreadyacceptedfd)

 {

         int i;

         int fd;

@@ -3076,7 +3111,10 @@ re_socketnewclient(re_t *re)

         addrlen=sizeof(addr);

         if(re==NULL)

                 return(-1); /* sanity check failed */

-        fd=accept(re->comms.serverfd,&addr,&addrlen);

+        if(alreadyacceptedfd==-1)

+                fd=accept(re->comms.serverfd,&addr,&addrlen);

+        else

+                fd=alreadyacceptedfd;

         if(re->comms.usedclients==re->comms.sizeclients) {

                 commclient_t **newclients;

                 if((newclients=realloc(re->comms.clients,sizeof(commclient_t *)*(re->comms.sizeclients+COMMCLIENTSBLOCKSIZE)))==NULL) {

@@ -3112,8 +3150,7 @@ re_socketnewclient(re_t *re)

         client->usedbufin=client->gotbufin=0;

         client->usedbufout=client->gotbufout=0;

         re->comms.usedclients++;

-        re_socketout(re, i, "OK\n");

-#if 1

+#if 0

 fprintf(stderr,"New client registered (%i).\n",i);

 #endif

         return(i);

@@ -3130,13 +3167,16 @@ int re_socketstep(re_t *re)

         int avail,queued;

         int nread,nwritten;

         char *ptr,*next,*end;

-        if(re==NULL || re->comms.serverfd==-1)

+        if(re==NULL)

                 return(-1); /* sanity check error */

         comms=&(re->comms);

         FD_ZERO(&readset);

         FD_ZERO(&writeset);

-        maxfd=comms->serverfd;

-        FD_SET(comms->serverfd,&readset);

+        maxfd=0;

+        if(comms->serverfd!=-1) {

+                maxfd=comms->serverfd;

+                FD_SET(comms->serverfd,&readset);

+        }

         for(i=0;i<comms->sizeclients;i++) {

                 if((client=comms->clients[i])==NULL || client->fd==-1)

                         continue;

@@ -3158,8 +3198,8 @@ int re_socketstep(re_t *re)

         if(select(maxfd+1,&readset,&writeset,NULL,&tv)<=0)

                 return(0); /* nothing to do */

         /* server */

-        if(FD_ISSET(comms->serverfd,&readset))

-                re_socketnewclient(re);

+        if(comms->serverfd!=-1 && FD_ISSET(comms->serverfd,&readset))

+                re_socketnewclient(re,-1);

         /* clients */

         for(i=0;i<comms->sizeclients;i++) {

                 if((client=comms->clients[i])==NULL || client->fd==-1)

@@ -3167,16 +3207,20 @@ int re_socketstep(re_t *re)

                 if(FD_ISSET(client->fd,&readset)) {

                         if((queued=sock_queued(client->fd))<=0) {

                                 /* remote has closed the connection */

-#if 1

+#if 0

 fprintf(stderr,"Unregistering client, remote has closed the connection (%i).\n",i);

 #endif

                                 close(client->fd),client->fd=-1;

+                                if(client->flag_connectedtoserver) {

+                                        client->flag_connectedtoserver=0;

+                                        re_socketinit(re,re->filename);

+                                }

                                 continue;

                         }

                         avail=(client->sizebufin-client->usedbufin);

                         queued=(queued>avail)?avail:queued;

                         if((nread=read(client->fd,client->bufin+client->usedbufin,queued))>0) {

-#if 1

+#if 0

 fprintf(stderr,"Read from client %li bytes (%i).\n",(long)nread,i);

 #endif

                                 client->usedbufin+=nread;

@@ -3203,7 +3247,7 @@ fprintf(stderr,"Read from client %li bytes (%i).\n",(long)nread,i);

                         queued=client->usedbufout-client->gotbufout;

                         if((nwritten=write(client->fd,client->bufout+client->gotbufout,client->usedbufout-client->gotbufout))>0)

                                 client->gotbufout+=nwritten;

-#if 1

+#if 0

 fprintf(stderr,"Write to client %li bytes (%i).\n",(long)nwritten,i);

 #endif

                 }

@@ -3217,14 +3261,23 @@ re_socketin(re_t *re, int nclient, char *line)

         /* note that the '\n' delimiter has been already removed */

         /* Commands can be sent from the command line using socat as in: */

         /* "socat - UNIX-CONNECT:/tmp/.re_${USER}/filename.ext" */

+        commclient_t *client;

         char *ptr;

-#if 1

+        int i;

+        if(re==NULL || nclient<0 || nclient>=re->comms.sizeclients || re->comms.clients[nclient]==NULL || line==NULL)

+                return(-1); /* sanity check failed */

+        client=re->comms.clients[nclient];

+#if 0

 fprintf(stderr,"Received from client \"%s\" (%i).\n",line,nclient);

 #endif

         if(memcmp(line,"goto ",5)==0) {

                 int oldline;

+                int avail;

                 ptr=line+5;

                 /* change line */

+#if 0

+fprintf(stderr,"Changing line because of command from client \"%s\" (%i).\n",line,nclient);

+#endif

                 re->command=COMMAND_GOTOLINE;

                 strncpy(re->commandbuf,ptr,sizeof(re->commandbuf));

                 re->commandbuf[sizeof(re->commandbuf)-1]='\0';

@@ -3237,6 +3290,33 @@ fprintf(stderr,"Received from client \"%s\" (%i).\n",line,nclient);

                 }

                 /* send end-of-results */

                 re_socketout(re, nclient, "\n");

+                /* forward command to all identified clients except the one who sent teh command */

+                for(i=0;i<re->comms.sizeclients;i++) {

+#if 0

+                        if(re->comms.clients[i]!=NULL)

+                                fprintf(stderr,"Client[%i] id:\"%s\"\n",i,re->comms.clients[i]->remoteid);

+#endif

+                        if(re->comms.clients[i]==NULL || re->comms.clients[i]->fd==-1 || re->comms.clients[i]->remoteid[0]=='\0')

+                                continue;

+                        avail=re->comms.clients[i]->sizebufout-re->comms.clients[i]->usedbufout;

+                        if((strlen(line)+1)>avail) {

+                                fprintf(stderr,"Couldn't forward command to client because the output buffer is full (avail:%li, req:%li)\n",(long)avail,(long)(strlen(line)+1));

+                                continue;

+                        }

+                        re_socketout(re, i, "%s\n",line);

+                }

+        } else if(memcmp(line,"id ",3)==0) {

+                ptr=line+3;

+                /* change id */

+#if 0

+fprintf(stderr,"Storing client id because of command from client \"%s\" (%i).\n",line,nclient);

+#endif

+                strncpy(client->remoteid,ptr,sizeof(client->remoteid));

+                client->remoteid[sizeof(client->remoteid)-1]='\0';

+                /* send end-of-results */

+                re_socketout(re, nclient, "\n");

+        } else if(line[0]=='\0' ) {

+                ; /* ignore the end-of-message (should only receive them on forwarding clients) */

         } else {

 #if 1

 fprintf(stderr,"Ignoring unknown command from client \"%s\" (%i).\n",line,nclient);