@@ -7,15 +7,13 @@ all: webkernel_test

 clean:

 	rm -f *.o webkernel_test

-webkernel_test: webkernel_test.o iobuf.o loglib.o parselib.o sbuf.o \

+webkernel_test: webkernel_test.o loglib.o parselib.o sbuf.o \

 		socklib.o webkernel.o

-	$(CC) $(LDFLAGS) webkernel_test.o iobuf.o loglib.o parselib.o sbuf.o \

+	$(CC) $(LDFLAGS) webkernel_test.o loglib.o parselib.o sbuf.o \

 		socklib.o webkernel.o -o webkernel_test

 webkernel_test.o:

-iobuf.o:

-

 loglib.o:

 parselib.o:

@@ -33,6 +33,10 @@ typedef struct wk_client {

         int sizeoutbufids;

         int usedoutbufids;

         int outbufids[MAXOUTBUF];

+        int serviced;

+        wk_uri uri;

+        int continuationactive;

+        int keepalive;

 } wk_client;

 typedef struct wk_clientblock {

@@ -64,15 +68,20 @@ typedef struct _wk {

         int sizebufblocks;

         int usedbufblocks;

         wk_bufblock *bufblocks;

+        void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/);

+        wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/);

+        wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/);

+        void *userptr;

 } _wk;

-static int wk_accept(_wk *web);

+static wk_client *wk_accept(_wk *web);

 static wk_client *wk_clientacquire(_wk *web);

 static int wk_clientrelease(_wk *web, int connid);

 static wk_client *wk_clientget(_wk *web, int connid);

+static void wk_clientserviceread(_wk *web, wk_client *client);

 wk *

-wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *paramweb,int connid, wk_event event, void *userptr*/), void (*callback_http)(/*wk *paramweb,int connid, wk_uri *uri, void *userptr*/), void (*callback_continuation)(/*wk *paramweb,int connid, wk_uri *uri, void *userptr*/), void *userptr)

+wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), void *userptr)

 {

         _wk *web;

         if(ssel==NULL || callback_http==NULL)

@@ -81,6 +90,10 @@ wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *paramweb,int conni

                 return(NULL);

         memset(web,0,sizeof(_wk));

         web->serverfd=-1;

+        web->callback_event=callback_event;

+        web->callback_http=callback_http;

+        web->callback_continuation=callback_continuation;

+        web->userptr=userptr;

         web->ssel=ssel;

         FD_ZERO(&(web->fdset));

         if((web->serverfd=ipv4_server(port))==-1) {

@@ -90,6 +103,8 @@ wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *paramweb,int conni

         sock_setunsafe(web->serverfd);

         FD_SET(web->serverfd,&(web->fdset));

         sselect_addread(ssel,web->serverfd,NULL);

+        if(web->callback_event!=NULL)

+                web->callback_event((wk *)web,-1,wke_init,web->userptr);

         return((wk *)web);

 }

@@ -103,6 +118,8 @@ wk_free(wk *paramweb)

         wk_bufblock *bb;

         if(web==NULL)

                 return;

+        if(web->callback_event!=NULL)

+                web->callback_event((wk *)web,-1,wke_fini,web->userptr);

         /* release server fds */

         if(web->serverfd!=-1) {

                 sselect_delread(web->ssel,web->serverfd);

@@ -137,7 +154,7 @@ wk_free(wk *paramweb)

         web->sizeclientblocks=0;

         if(web->clientblocks!=NULL)

                 free(web->clientblocks),web->clientblocks=NULL;

-	/* release the used sbuf */

+        /* release the used sbuf */

         for(i=0;i<web->usedbufblocks;i++) {

                 bb=web->bufblocks+i;

                 if(bb->bufs==NULL)

@@ -157,7 +174,15 @@ wk_free(wk *paramweb)

 wk_uri *

 wk_geturi(wk *paramweb, int connid)

 {

-

+        _wk *web=(_wk *)paramweb;

+        wk_client *client;

+        if(web==NULL)

+                return(NULL);

+        if((client=wk_clientget(web,connid))==NULL)

+                return(NULL);

+        if(client->serviced==0)

+                return(NULL);

+        return(&(client->uri));

 }

 int

@@ -165,8 +190,9 @@ wk_service(wk *paramweb)

 {

         int fds[FDBLOCK];

         int fd;

-        int n;

-        int i;

+        int n,i,k;

+        sbuf *in;

+        sbuf *out;

         _wk *web=(_wk *)paramweb;

         wk_client *client;

         if(web==NULL)

@@ -176,14 +202,66 @@ wk_service(wk *paramweb)

                         fd=fds[i];

                         if(fd==web->serverfd) {

                                 /* accept new connection */

-                                wk_accept(web);

+                                if((client=wk_accept(web))!=NULL && web->callback_event!=NULL)

+                                        web->callback_event((wk *)web,client->connid,wke_connected,web->userptr);

+                                continue; /* all done here */

+                        }

+                        if((client=(wk_client *)sselect_getuserptr(web->ssel,fd))==NULL || client->web!=(wk *)web) {

+                                wk_close((wk *)web,client->connid);

+                                continue; /* internal error */

+                        }

+                        if((in=wk_sbufget((wk *) web,client->inbufid))==NULL) {

+                                wk_close((wk *)web,client->connid);

+                                continue; /* internal error */

+                        }

+                        if(sbuf_unused(in)<=0) {

+                                /* no room for the new data */

+                                sselect_delread(web->ssel,fd);

+                                continue;

+                        }

+                        if(sbuf_fill(in,fd,sock_queued(fd))==0) {

+                                /* client has closed connection */

+                                wk_close((wk *) web, fd);

                                 continue;

                         }

+                        wk_clientserviceread(web,client);

+                }

+        }

+        while((n=sselect_getwritefiltered(web,&(web->fdset),fds,sizeof(fds)/sizeof(fds[0])))>0) {

+                for(i=0;i<n;i++) {

+                        fd=fds[i];

                         if((client=(wk_client *)sselect_getuserptr(web->ssel,fd))==NULL || client->web!=(wk *)web)

                                 continue; /* internal error */

-

+                        for(out=NULL,k=client->usedoutbufids-1;k>=0;k--) {

+                                if((out=wk_sbufget((wk *) web,client->outbufids[k]))==NULL) {

+                                        k=-1;

+                                        break; /* internal error */

+                                }

+                        }

+                        if(k==-1 || out==NULL) {

+                                wk_close((wk *)web,client->connid);

+                                continue; /* internal error */

+                        }

+                        sbuf_send(out,fd,sbuf_count(out));

+                        if(sbuf_count(out)==0) {

+                                if(k>0) {

+                                        client->usedoutbufids--;

+                                        wk_sbufrelease((wk *)web,client->outbufids[k]),client->outbufids[k]=-1;

+                                } else {

+                                        sselect_delwrite(web->ssel,client->fd);

+                                        if(client->continuationactive && web->callback_continuation!=NULL) {

+                                                client->continuationactive=web->callback_continuation((wk *)web,client->connid,&(client->uri),web->userptr);

+                                        } else {

+                                                client->serviced=0; /* we have finished servicing this one */

+                                                if(!client->keepalive)

+                                                        wk_close((wk *)web, fd); /* all sent */

+

+                                        }

+                                }

+                        }

                 }

         }

+        return(0);

 }

 int

@@ -219,7 +297,22 @@ wk_write(wk *paramweb, int connid, void *data, int datalen)

 int

 wk_close(wk *paramweb, int connid)

 {

-

+        _wk *web=(_wk *)paramweb;

+        wk_client *client;

+        if(web==NULL)

+                return(-1);

+        if((client=wk_clientget(web,connid))==NULL)

+                return(-1);

+        if(client->fd!=-1) {

+                sselect_delread(web->ssel,client->fd);

+                sselect_delwrite(web->ssel,client->fd);

+                FD_CLR(client->fd,&(web->fdset));

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

+        }

+        wk_clientrelease(web,connid);

+        if(web->callback_event!=NULL)

+                web->callback_event((wk *)web,connid,wke_closed,web->userptr);

+        return(0);

 }

 char *

@@ -384,21 +477,21 @@ wk_bufget(wk *paramweb, int sbufid)

 /* local functions */

-static int

+static wk_client *

 wk_accept(_wk *web)

 {

         int newfd;

         wk_client *client;

         if((newfd=sock_accept(web->serverfd))==-1)

-                return(-1);

+                return(NULL);

         if((client=wk_clientacquire(web))==NULL) {

                 close(newfd),newfd=-1;

-                return(-1);

+                return(NULL);

         }

         client->fd=newfd;

         FD_SET(client->fd,&(web->fdset));

         sselect_addread(web->ssel,client->fd,(void *)client);

-        return(0);

+        return(client);

 }

 static wk_client *

@@ -483,7 +576,7 @@ wk_clientrelease(_wk *web, int connid)

         web->clientblocks[numblock].acquired[j>>3]&=(~bit);

         if(client->inbufid!=-1)

                 wk_sbufrelease((wk *)web,client->inbufid),client->inbufid=-1;

-        for(w=0;w<client->usedoutbufids;w++) 

+        for(w=0;w<client->usedoutbufids;w++)

                 wk_sbufrelease((wk *)web,client->outbufids[w]),client->outbufids[w]=-1;

         memset(client,0,sizeof(wk_client));

         return(0);

@@ -505,4 +598,9 @@ wk_clientget(_wk *web, int connid)

         return(web->clientblocks[numblock].clients+j);

 }

+static void

+wk_clientserviceread(_wk *web, wk_client *client)

+{

+#warning TODO

+}

@@ -38,7 +38,12 @@ typedef enum wk_error {

         wkerr_notimplemented=501,

 } wk_error;

-wk *wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), void (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), void (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), void *userptr);

+typedef enum wk_action {

+        wkact_finished=0,

+        wkact_continuation,

+} wk_action;

+

+wk *wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), void *userptr);

 void wk_free(wk *web);

 wk_uri *wk_geturi(wk *web, int connid); /* for use in callback_event() when wke_closed */