Changeset 575 for libcacaTweet

Timestamp:

Mar 9, 2006, 8:27:14 PM (17 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Multiplexed sockets, it is now possible to have multiple clients at the same time watching for the same libcaca application. And no fork or threads involved. THAT'S high technology.

Location:

libcaca/trunk

Files:

• build-kernel (modified) (1 diff)
• caca/driver_network.c (modified) (7 diffs)

libcaca/trunk/build-kernel

@@ -34 +34 @@
 
 # For further development: create floppy images using the kernel
-#gcc -traditional -c -o bootsect.o bootsect.S
-#ld -Ttext 0x0 -s --oformat binary bootsect.o -o cacafire.img
+gcc -traditional -c -o bootsect.o /usr/src/linux/arch/i386/boot/bootsect.S
+ld -Ttext 0x0 -s --oformat binary bootsect.o -o cacafire.img
 

libcaca/trunk/caca/driver_network.c

@@ -26 +26 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <fcntl.h>
 #include <string.h>
 
@@ -50 +51 @@
     int clilen;
     char buffer[256];
+
+    int client_count;
+    int *fd_list;
+
 };
 
@@ -70 +75 @@
 {
     int yes=1;
+
     printf("Initing network stack.\n");
 
     kk->drv.p = malloc(sizeof(struct driver_private));
-
+    if(kk->drv.p == NULL)
+        return -1;
 
     kk->drv.p->width = 80;
     kk->drv.p->height = 24;
     kk->drv.p->port = 7575; // 75 75 decimal ASCII -> KK   // FIXME, sadly
+    kk->drv.p->client_count = 0;
+    kk->drv.p->fd_list = NULL;
+
 
 
@@ -93 +103 @@
         return -1;
     }
-
 
     kk->drv.p->my_addr.sin_family = AF_INET;
@@ -106 +115 @@
         return -1;
     }
+
+    /* Non blocking socket */
+    fcntl(kk->drv.p->sockfd, F_SETFL, O_NONBLOCK);
+
+
     printf("listen\n");
     if (listen(kk->drv.p->sockfd, BACKLOG) == -1) {
@@ -112 +126 @@
     }
 
-    printf("accept\n");
+    printf("network ok.\n");
+
+    return 0;
+}
+
+static int network_end_graphics(caca_t *kk)
+{
+    int i;
+    for(i = 0; i < kk->drv.p->client_count; i++) {
+        close(kk->drv.p->fd_list[i]);
+    }
+    return 0;
+}
+
+static int network_set_window_title(caca_t *kk, char const *title)
+{
+    /* Not handled (yet)*/
+    return 0;
+}
+
+static unsigned int network_get_window_width(caca_t *kk)
+{
+    return kk->drv.p->width * 6;
+}
+
+static unsigned int network_get_window_height(caca_t *kk)
+{
+    return kk->drv.p->height * 10;
+}
+
+static void network_display(caca_t *kk)
+{
+    int size, i;
+    char *to_send = cucul_get_ansi(kk->qq, 0, &size);;
+  
     kk->drv.p->clilen = sizeof(kk->drv.p->remote_addr);
     kk->drv.p->new_fd = accept(kk->drv.p->sockfd, (struct sockaddr *) &kk->drv.p->remote_addr, &kk->drv.p->clilen);
-    if (kk->drv.p->new_fd < 0) {
-        perror("ERROR on accept");
-        return -1;
-    }
-
-
-    printf("Got connexion from %d.%d.%d.%d\n", 
-           (unsigned int)((kk->drv.p->remote_addr.sin_addr.s_addr)&0x000000FF),
-           (unsigned int)((kk->drv.p->remote_addr.sin_addr.s_addr)&0x0000FF00)>>8,
-           (unsigned int)((kk->drv.p->remote_addr.sin_addr.s_addr)&0x00FF0000)>>16,
-           (unsigned int)((kk->drv.p->remote_addr.sin_addr.s_addr)&0xFF000000)>>24);
+    if(kk->drv.p->new_fd != -1)
+        {
+
+            if(kk->drv.p->fd_list == NULL) {
+                kk->drv.p->fd_list = malloc(sizeof(int));
+                if(kk->drv.p->fd_list == NULL)
+                    return;
+                kk->drv.p->fd_list[kk->drv.p->client_count] = kk->drv.p->new_fd;
+            } else {
+                kk->drv.p->fd_list = realloc(kk->drv.p->fd_list, (kk->drv.p->client_count+1) * sizeof(int));
+                kk->drv.p->fd_list[kk->drv.p->client_count] = kk->drv.p->new_fd;
+            }
+
+            kk->drv.p->client_count++;
+
+        }
+
+    for(i = 0; i < kk->drv.p->client_count; i++) {
+        if(kk->drv.p->fd_list[i] == -1)
+           continue;
+        
+        /* FIXME, handle >255 sizes */
+            codes[16] = (unsigned char) kk->drv.p->width&0xff;
+            codes[18] = (unsigned char) kk->drv.p->height&0xff;
+            
+            /* Send basic telnet codes */
+            if (send(kk->drv.p->fd_list[i], codes,sizeof(codes) , 0) == -1) {
+                kk->drv.p->fd_list[i] = -1;
+             }
+            
+            /* ANSI code for move(0,0)*/
+            if (send(kk->drv.p->fd_list[i], "\033[1,1H", 6, 0) == -1) {
+                kk->drv.p->fd_list[i] = -1;
+            }
+            
+            if (send(kk->drv.p->fd_list[i], to_send, size, 0) == -1) {
+                kk->drv.p->fd_list[i] = -1;
+            }
+        }
     
-    /* FIXME, handle >255 sizes */
-    codes[16] = (unsigned char) kk->drv.p->width&0xff;
-    codes[18] = (unsigned char) kk->drv.p->height&0xff;
-
-    /* Send basic telnet codes */
-    if (send(kk->drv.p->new_fd, codes,sizeof(codes) , 0) == -1) {
-        perror("send");
-        return -1;
-    }
-
-    printf("network ok.\n");
-
-    return 0;
-}
-
-static int network_end_graphics(caca_t *kk)
-{
-    printf("network end graphics\n");
-    return 0;
-}
-
-static int network_set_window_title(caca_t *kk, char const *title)
-{
-    printf("network_set_window_title(%s) not implemented yet.\n", title);
-    return 0;
-}
-
-static unsigned int network_get_window_width(caca_t *kk)
-{
-    return kk->drv.p->width * 6;
-}
-
-static unsigned int network_get_window_height(caca_t *kk)
-{
-    return kk->drv.p->height * 10;
-}
-
-static void network_display(caca_t *kk)
-{
-    int size;
-    char *to_send = cucul_get_ansi(kk->qq, 0, &size);;
-  
-    
-    /* ANSI code for move(0,0)*/
-    if (send(kk->drv.p->new_fd, "\033[1,1H", 6, 0) == -1) {
-        perror("send");
-        return;
-    }
-    
-    if (send(kk->drv.p->new_fd, to_send, size, 0) == -1) {
-        perror("send");
-        return;
-    }
-
 }
 static void network_handle_resize(caca_t *kk)
 {
-    printf("Resize\n");
- 
+    /* Not handled */
 }
 
 static unsigned int network_get_event(caca_t *kk)
 {
+    /* Not handled */
     return 0;
 }
@@ -213 +235 @@
 
 #endif // USE_NETWORK
+