Changeset afa113a315cc3a8540fbd86ca2667b9be278dd0b

Timestamp:

03/16/10 19:26:52 (23 months ago)

Author:

D.J. Capelis <dev@…>

Parents:

fc4ae5ac4c3000ecb26d84ab72fe84f304e4bad5

Children:

ba815f017780c3a855c8afda37cd204684d1ed70

git-committer:

D.J. Capelis <dev@capelis.dj> / 2010-03-16T19:26:52Z-0700

Message:

This is the version of fived that was used in the testing for CMPS232 at UCSC.

An important bug is fixed in this commit that allows for fived to
actually work correctly when there's a bunch of data heading at it.
Fived incorrect assumed at one point that a read would read the entire
range.

Files:

• handler.c (modified) (6 diffs)

handler.c

@@ -45 +45 @@
         {
 incoming:
-            if(!s->ssl)
+            if(!s->ssl)  //TODO: re-write everything here to use gettalk()
             {
                 if(!s->multiplex)
@@ -324 +324 @@
         if(mode == 1)
         {
-            int chunk = 0;
             len = 0;
             while(1)
@@ -334 +333 @@
                     if(s->multiplex)
                     {
-                        printf("fd %d has an event\n", events[i].data.fd);
+                        //printf("fd %d has an event\n", events[i].data.fd);
                         if(events[i].data.fd != s->sock)
                         {
@@ -355 +354 @@
                         else
                             len = SSL_read(s->ssl, &s->header, 16);
+                        //printf("%x | %x | %x | %x\n", ntohl(s->ptr[0]), ntohl(s->ptr[1]), ntohl(s->ptr[2]), ntohl(s->ptr[3]));
                         //if(len < 1)
                         if(len != 16)
                             goto kill;
-                        chunk = ntohl(s->ptr[3]);
+                        s->multiplex_xtra = ntohl(s->ptr[3]);
                         if(ntohl(s->ptr[1]) == 0 && ntohl(s->ptr[3]) != 0) //They're talking to tcpmux
                         {
                             if(ntohl(s->ptr[2]) != 0)
                                 printf("Client is sending flags about id 0, something is wrong\n");
-                            len = chunk;
+                            len = s->multiplex_xtra;
+                            s->multiplex_xtra = 0; //TODO: revise this when you refactor the incoming module
                             goto incoming;
                         }
-                        if(ntohl(s->ptr[2]) == 2)
+                        if(ntohl(s->ptr[2]) == DEL_PLEX)
                         {
-                            close(ntohl(s->ptr[1])); //Yeah, we should actually have our own table and be verifying
+                            close(ntohl(s->ptr[1])); //TODO: Yeah, we should actually have our own table and be verifying
                             continue;
                         }
-                        while(chunk > BUFFER)
+                        while(s->multiplex_xtra != 0)
                         {
+                            if(s->multiplex_xtra > BUFFER)
+                                len = BUFFER;
+                            else
+                                len = s->multiplex_xtra;
                             if(!s->ssl)
-                                len = read(s->sock, netbuffer, BUFFER);
+                                len = read(s->sock, netbuffer, len);
                             else
-                                SSL_read(s->ssl, netbuffer, chunk);
-                            write(ntohl(s->ptr[1]), netbuffer, len);
-                            chunk -= len;
+                                len = SSL_read(s->ssl, netbuffer, len);
+                            chk_error(write(ntohl(s->ptr[1]), netbuffer, len) != len);
+                            //printf("Wrote %d bytes to fd %d\n", len, ntohl(s->ptr[1]));
+                            s->multiplex_xtra -= len;
                         }
-                        if(!s->ssl)
-                            read(s->sock, netbuffer, chunk);
-                        else
-                            SSL_read(s->ssl, netbuffer, chunk);
-                        write(ntohl(s->ptr[1]), netbuffer, chunk);
-                        printf("Wrote %d bytes to fd %d\n", chunk, ntohl(s->ptr[1]));
                         continue;
                     }
@@ -407 +407 @@
         }
     }
+
+err:
+    perror("Error");
 
     return NULL;
@@ -502 +505 @@
 void send_header(struct session * s, int id, int flags, int len)
 {
-    printf("Sending to id %d len %d with flags %d\n", id, len, flags);
+    //printf("Sending to id %d len %d with flags %d\n", id, len, flags);
     char header[16];
     int * ptr = (int *) &header;