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

Timestamp:

Nov 29, 2009, 12:29:51 PM (11 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Moved socket-related stuff to struct comm

File:

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

neercs/trunk/src/attach.c

@@ -87 +87 @@
 
     myaddr.sun_family = AF_UNIX;
-    strncpy(myaddr.sun_path, screen_list->socket_path[socktype],
+    strncpy(myaddr.sun_path, screen_list->comm.socket_path[socktype],
             sizeof(myaddr.sun_path) - 1);
 
-    unlink(screen_list->socket_path[socktype]);
+    unlink(screen_list->comm.socket_path[socktype]);
 
     if (bind(sock, (struct sockaddr *)&myaddr, sizeof(struct sockaddr_un)) < 0)
     {
-        free(screen_list->socket_path[socktype]);
-        screen_list->socket_path[socktype] = NULL;
+        free(screen_list->comm.socket_path[socktype]);
+        screen_list->comm.socket_path[socktype] = NULL;
         close(sock);
         perror("create_socket:bind");
@@ -102 +102 @@
     fcntl(sock, F_SETFL, O_NONBLOCK);
 
-    debug("Listening on %s (%d)", screen_list->socket_path[socktype], sock);
-
-    screen_list->socket[socktype] = sock;
+    debug("Listening on %s (%d)", screen_list->comm.socket_path[socktype], sock);
+
+    screen_list->comm.socket[socktype] = sock;
 
     return 0;
@@ -162 +162 @@
     memset(&addr, 0, sizeof(addr));
     addr.sun_family = AF_UNIX;
-    strcpy(addr.sun_path, screen_list->socket_path[socktype]);
+    strcpy(addr.sun_path, screen_list->comm.socket_path[socktype]);
     if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0)
     {
         debug("Failed to connect to %s: %s",
-              screen_list->socket_path[socktype], strerror(errno));
+              screen_list->comm.socket_path[socktype], strerror(errno));
         close(sock);
         return NULL;
@@ -172 +172 @@
     fcntl(sock, F_SETFL, O_NONBLOCK);
 
-    screen_list->socket[socktype] = sock;
+    screen_list->comm.socket[socktype] = sock;
 
     if (socktype == SOCK_SERVER)
     {
-        return socket_to_session(screen_list->socket_path[socktype]);
+        return socket_to_session(screen_list->comm.socket_path[socktype]);
     }
     else
@@ -193 +193 @@
     buf[bytes] = '\0';
     debug("Requesting attach: %s", buf);
-    return write(screen_list->socket[SOCK_SERVER], buf, strlen(buf)) <= 0;
+    return write(screen_list->comm.socket[SOCK_SERVER], buf, strlen(buf)) <= 0;
 }
 
@@ -202 +202 @@
     char *ret = NULL;
 
-    sockets = list_sockets(screen_list->socket_dir, screen_list->session_name);
+    sockets = list_sockets(screen_list->comm.socket_dir, screen_list->comm.session_name);
     if (sockets)
     {
@@ -384 +384 @@
 void attach(struct screen_list *screen_list)
 {
-    screen_list->socket_path[SOCK_SERVER] = select_socket(screen_list);
-
-    if (screen_list->socket_path[SOCK_SERVER])
+    screen_list->comm.socket_path[SOCK_SERVER] = select_socket(screen_list);
+
+    if (screen_list->comm.socket_path[SOCK_SERVER])
     {
         char *session;
@@ -401 +401 @@
             caca_set_cursor(screen_list->dp, 1);
 
-            screen_list->socket_path[SOCK_CLIENT] =
-                build_socket_path(screen_list->socket_dir, session,
+            screen_list->comm.socket_path[SOCK_CLIENT] =
+                build_socket_path(screen_list->comm.socket_dir, session,
                                   SOCK_CLIENT);
             create_socket(screen_list, SOCK_CLIENT);
             request_attach(screen_list);
-            if (screen_list->session_name)
-                free(screen_list->session_name);
-            screen_list->session_name = session;
+            if (screen_list->comm.session_name)
+                free(screen_list->comm.session_name);
+            screen_list->comm.session_name = session;
         }
         else
         {
             fprintf(stderr, "Failed to attach!\n");
-            free(screen_list->socket_path[SOCK_SERVER]);
-            screen_list->socket_path[SOCK_SERVER] = NULL;
+            free(screen_list->comm.socket_path[SOCK_SERVER]);
+            screen_list->comm.socket_path[SOCK_SERVER] = NULL;
             screen_list->attach = 0;
         }