Changeset 2614 for neercs/trunk/src/attach.cTweet

Timestamp:

Jul 31, 2008, 1:34:55 AM (12 years ago)

Author:

Pascal Terjan

Message:

• Factorize some code in attach.c

File:

• neercs/trunk/src/attach.c (modified) (11 diffs)

neercs/trunk/src/attach.c

@@ -17 +17 @@
 #include "neercs.h"
 
-char * build_socket_path(char *socket_dir, char *session_name, int client)
+char * build_socket_path(char *socket_dir, char *session_name, enum socket_type socktype)
 {
     char *path, *dir;
@@ -29 +29 @@
         dir = "/tmp";
     if(path)
-        snprintf(path, PATH_MAX+1, "%s/neercs.%s%s.sock", dir, session_name, client?"":".srv");
+        snprintf(path, PATH_MAX+1, "%s/neercs.%s%s.sock", dir, session_name, socktype?"":".srv");
     return path;
 }
 
-int create_client_socket(struct screen_list* screen_list)
+int create_socket(struct screen_list* screen_list, enum socket_type socktype)
 {
     int sock;
@@ -42 +42 @@
     if(sock < 0)
     {
-        perror("create_client_socket:socket");
+        perror("create_socket:socket");
         return errno;
     }
@@ -49 +49 @@
 
     myaddr.sun_family = AF_UNIX;
-    strncpy(myaddr.sun_path, screen_list->c_socket_path, sizeof(myaddr.sun_path) - 1);
+    strncpy(myaddr.sun_path, screen_list->socket_path[socktype], sizeof(myaddr.sun_path) - 1);
 
-    unlink(screen_list->c_socket_path);
+    unlink(screen_list->socket_path[socktype]);
 
     if(bind(sock, (struct sockaddr *)&myaddr, sizeof(struct sockaddr_un)) < 0)
     {
-        free(screen_list->c_socket_path);
-        screen_list->c_socket_path = NULL;
-        close(sock);
-        perror("create_client_socket:bind");
-        return errno;
-    }
-    fcntl(sock, F_SETFL, O_NONBLOCK);
-
-    debug("Client listening on %s (%d)", screen_list->c_socket_path, sock);
-
-    screen_list->c_socket = sock;
-
-    return 0;
-}
-
-int create_server_socket(struct screen_list* screen_list)
-{
-    int sock;
-    struct sockaddr_un myaddr;
-
-    sock = socket(AF_UNIX, SOCK_DGRAM, 0);
-
-    if(sock < 0)
-    {
-        perror("create_server_socket:socket");
-        return errno;
-    }
-
-    memset(&myaddr, 0, sizeof(struct sockaddr_un));
-
-    myaddr.sun_family = AF_UNIX;
-    strncpy(myaddr.sun_path, screen_list->s_socket_path, sizeof(myaddr.sun_path) - 1);
-
-    unlink(screen_list->s_socket_path);
-
-    if(bind(sock, (struct sockaddr *)&myaddr, sizeof(struct sockaddr_un)) < 0)
-    {
-        free(screen_list->s_socket_path);
-        screen_list->s_socket_path = NULL;
+        free(screen_list->socket_path[socktype]);
+        screen_list->socket_path[socktype] = NULL;
         close(sock);
         perror("create_socket:bind");
@@ -100 +63 @@
     fcntl(sock, F_SETFL, O_NONBLOCK);
 
-    debug("Server listening on %s (%d)", screen_list->s_socket_path, sock);
+    debug("Listening on %s (%d)", screen_list->socket_path[socktype], sock);
 
-    screen_list->s_socket = sock;
+    screen_list->socket[socktype] = sock;
 
     return 0;
@@ -142 +105 @@
 }
 
-char * connect_server(struct screen_list* screen_list)
+char * connect_socket(struct screen_list* screen_list, enum socket_type socktype)
 {
     int sock;
@@ -148 +111 @@
     char *p, *s;
 
-    debug("Connecting to %s", screen_list->s_socket_path);
+    debug("Connecting to %s", screen_list->socket_path[socktype]);
 
     /* Open the socket */
@@ -158 +121 @@
     memset(&addr,0,sizeof(addr));
     addr.sun_family = AF_UNIX;
-    strcpy(addr.sun_path,screen_list->s_socket_path);
+    strcpy(addr.sun_path,screen_list->socket_path[socktype]);
     if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0)
     {
-        fprintf(stderr, "Failed to connect to %s: %s\n", screen_list->s_socket_path, strerror(errno));
+        fprintf(stderr, "Failed to connect to %s: %s\n", screen_list->socket_path[socktype], strerror(errno));
         return NULL;
     }
     fcntl(sock, F_SETFL, O_NONBLOCK);
 
-    screen_list->s_socket = sock;
+    screen_list->socket[socktype] = sock;
 
-    p = strrchr(screen_list->s_socket_path, '/');
-    p+=8; /* skip neercs. */
-    s = strdup(p);
-    p = strrchr(s, '.');
-    *p = '\0'; /* drop .sock */
-    p = strrchr(s, '.');
-    *p = '\0'; /* drop .srv */
-    p = strdup(s);
-    free(s);
-    return p;
-}
-
-int connect_client(struct screen_list* screen_list)
-{
-    int sock;
-    struct sockaddr_un addr;
-
-    debug("Connecting to %s", screen_list->c_socket_path);
-
-    /* Open the socket */
-    if ((sock = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) {
-        perror("connect_client:socket");
-        return 1;
+    if(socktype == SOCK_SERVER)
+    {
+        p = strrchr(screen_list->socket_path[socktype], '/');
+        p+=8; /* skip neercs. */
+        s = strdup(p);
+        p = strrchr(s, '.');
+        *p = '\0'; /* drop .sock */
+        p = strrchr(s, '.');
+        *p = '\0'; /* drop .srv */
+        p = strdup(s);
+        free(s);
+        return p;
     }
-
-    memset(&addr,0,sizeof(addr));
-    addr.sun_family = AF_UNIX;
-    strcpy(addr.sun_path,screen_list->c_socket_path);
-    if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0)
-    {
-        fprintf(stderr, "Failed to connect to %s: %s\n", screen_list->c_socket_path, strerror(errno));
-        return 1;
-    }
-    fcntl(sock, F_SETFL, O_NONBLOCK);
-
-    screen_list->c_socket = sock;
-
-    return 0;
+    else
+        return NULL;
 }
 
@@ -219 +159 @@
     buf[bytes] = '\0';
     debug("Requesting attach: %s", buf);
-    return write(screen_list->s_socket, buf, strlen(buf)) <= 0;
+    return write(screen_list->socket[SOCK_SERVER], buf, strlen(buf)) <= 0;
 }
 
@@ -235 +175 @@
         buf[bytes] = '\0';
         debug("Sending key press to server: %s", buf);
-        return write(screen_list->s_socket, buf, strlen(buf)) <= 0;
+        return write(screen_list->socket[SOCK_SERVER], buf, strlen(buf)) <= 0;
     }
     else if(t & CACA_EVENT_RESIZE)
@@ -247 +187 @@
         buf[bytes] = '\0';
         debug("Sending resize to server: %s", buf);
-        return write(screen_list->s_socket, buf, strlen(buf)) <= 0;
+        return write(screen_list->socket[SOCK_SERVER], buf, strlen(buf)) <= 0;
     }
     else if(t & CACA_EVENT_QUIT)
-        return write(screen_list->s_socket, "QUIT", strlen("QUIT")) <= 0;
+        return write(screen_list->socket[SOCK_SERVER], "QUIT", strlen("QUIT")) <= 0;
 
     return 0;