@@ -29,6 +29,7 @@ typedef struct wk_client {

 typedef struct wk_clientblock {

         int sizeclients;

         int usedclients;

+        unsigned char acquired[CLIENTBLOCKBLOCK/8];

         wk_client *clients;

 } wk_clientblock;

@@ -44,7 +45,7 @@ typedef struct _wk {

 static int wk_accept(_wk *web);

 static wk_client *wk_clientacquire(_wk *web);

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

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

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

 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)

@@ -70,14 +71,47 @@ wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *paramweb,int conni

 void

 wk_free(wk *paramweb)

 {

+        int i,j,k,n;

         _wk *web=(_wk *)paramweb;

+        wk_clientblock *cb;

+        wk_client *client;

         if(web==NULL)

                 return;

+        /* release server fds */

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

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

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

                 close(web->serverfd),web->serverfd=-1;

         }

+        /* release client fds and free clients */

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

+                cb=web->clientblocks+i;

+                if(cb->clients==NULL)

+                        continue;

+                for(j=0;j<cb->sizeclients;j+=8) {

+                        if(cb->acquired[j>>3]==0)

+                                continue;

+                        for(k=0x1,n=0;n<8;n++,k<<=1) {

+                                if(!(cb->acquired[j>>3]&k))

+                                        continue;

+                                client=cb->clients+j+k;

+                                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;

+                                }

+                        }

+                }

+                cb->usedclients=0;

+                cb->sizeclients=0;

+                free(cb->clients),cb->clients=NULL;

+        }

+        web->usedclientblocks=0;

+        web->sizeclientblocks=0;

+        if(web->clientblocks!=NULL)

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

+        /* free the main struct */

         free(web),web=NULL;

 }

@@ -244,24 +278,86 @@ wk_accept(_wk *web)

 static wk_client *

 wk_clientacquire(_wk *web)

 {

-#warning TODO

+        int i,j,k;

+        wk_clientblock *cb;

+        wk_client *client;

+        /* make sure there are free clientblocks */

+        if(web->usedclientblocks==web->sizeclientblocks) {

+                wk_clientblock *newcb;

+                if((newcb=(wk_clientblock *)realloc(web->clientblocks,web->sizeclientblocks+CLIENTBLOCKBLOCK))==NULL)

+                        return(NULL); /* insufficient memory */

+                web->clientblocks=newcb;

+                memset(web->clientblocks+web->sizeclientblocks,0,CLIENTBLOCKBLOCK*sizeof(wk_clientblock));

+                web->sizeclientblocks+=CLIENTBLOCKBLOCK;

+        }

+        /* search for a block with unused clients (or the first unalloc'd block) */

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

+                cb=web->clientblocks+i;

+                if(cb->clients==NULL || cb->usedclients<cb->sizeclients)

+                        break;

+        }

+        if(i>=web->sizeclientblocks)

+                return(NULL); /* internal error */

+        /* alloc block if not alloc'd */

+        if(cb->clients==NULL) {

+                if((cb->clients=malloc(sizeof(wk_client)*CLIENTBLOCK))==NULL)

+                        return(NULL); /* insufficient memory */

+                memset(cb->clients,0,sizeof(wk_client)*CLIENTBLOCK);

+                cb->sizeclients=CLIENTBLOCK;

+        }

+        /* get first unused client */

+        for(j=0;j<cb->sizeclients;j+=8) {

+                if(cb->acquired[j>>3]!=0xff)

+                        break;

+        }

+        if(j>=cb->sizeclients)

+                return(NULL); /* internal error */

+        for(k=0x01;k<0x100;k<<=1,j++) {

+                if((cb->acquired[j>>3]&k)==0)

+                        break;

+        }

+        if(k>=0x100)

+                return(NULL); /* internal error */

+        cb->acquired[j>>3]|=k;

+        cb->usedclients++;

+        /* initialize client and return it */

+        client=cb->clients+j;

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

+        client->web=(wk *)web;

+        client->connid=i*CLIENTBLOCK+j;

+        client->fd=-1;

+        return(client);

 }

 static int

 wk_clientrelease(_wk *web, int connid)

 {

+        wk_client *client;

+        int numblock,j,bit;

+        numblock=connid/CLIENTBLOCK;

+        j=connid%CLIENTBLOCK;

+        bit=0x1<<(j&3);

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

+                return(-1);

+        web->clientblocks[numblock].usedclients--;

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

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

+        return(0);

 }

-wk_client *

+static wk_client *

 wk_clientget(_wk *web, int connid)

 {

-        int numblock;

+        int numblock,j,bit;

         numblock=connid/CLIENTBLOCK;

+        j=connid%CLIENTBLOCK;

+        bit=0x1<<(j&3);

         if(web==NULL ||

           web->clientblocks==NULL ||

           web->sizeclientblocks<=numblock ||

-          web->clientblocks[numblock].clients==NULL)

+          web->clientblocks[numblock].clients==NULL ||

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

                 return(NULL);

-        return(web->clientblocks[numblock].clients+(connid%CLIENTBLOCK));

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

 }