@@ -148,15 +148,15 @@ wk_debug_io(char *iotype, int fd, char *ptr, long int size)

 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_post)(/*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_init(int serverfd, 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_post)(/*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)

+        if(ssel==NULL || callback_http==NULL || serverfd==-1)

                 return(NULL);

         if((web=malloc(sizeof(_wk)))==NULL)

                 return(NULL);

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

-        web->serverfd=-1;

+        web->serverfd=serverfd;

         web->callback_event=callback_event;

         web->callback_http=callback_http;

         web->callback_post=callback_post;

@@ -164,11 +164,6 @@ wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk

         web->userptr=userptr;

         web->ssel=ssel;

         FD_ZERO(&(web->fdset));

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

-                wk_free((wk *)web),web=NULL;

-                return(NULL);

-        }

-        sock_setunsafe(web->serverfd);

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

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

         if(web->callback_event!=NULL)

@@ -188,11 +183,10 @@ wk_free(wk *paramweb)

                 return;

         if(web->callback_event!=NULL)

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

-        /* release server fds */

+        /* unregister the server fd */

         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++) {

@@ -44,7 +44,7 @@ typedef enum wk_action {

         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_post)(/*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 *wk_init(int serverfd, 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_post)(/*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 */

@@ -83,8 +83,8 @@ main(int argc, char *argv[])

         }

         if(totalfail!=0)

                 printf("Failed %i of %i tests.\n",totalfail,total);

-	else

-		printf("Passed %i of %i tests.\n",total,total);

+        else

+                printf("Passed %i of %i tests.\n",total,total);

         return((totalfail!=0)?1:0);

 }

@@ -399,6 +399,7 @@ webkernel_basic(test_action action)

         int fds[2];

         char buf[128];

         int usedbuf;

+        int serverfd;

         char test_request[]={"\

 GET /test.cgi HTTP/1.0\r\n\

 Host: localhost\r\n\

@@ -417,9 +418,10 @@ Connection: keep-alive\r\n\

         check=0;

         if((ssel=sselect_init())==NULL)

                 return(STRING_FAIL ": couln't alloc a sselect structure");

-        for(port=19747,off=0,check=0;(web=wk_init(port,ssel,NULL,webkernel_basichttp,NULL,NULL,&check))==NULL;off++,port++)

+        for(port=19747,off=0,check=0;(serverfd=ipv4_server(port))==-1;off++,port++)

                 ;

-        if(web==NULL) {

+        sock_setunsafe(serverfd);

+        if((web=wk_init(serverfd,ssel,NULL,webkernel_basichttp,NULL,NULL,&check))==NULL) {

                 webkernel_basicclose(&client,&ssel,&host,&web);

                 return(STRING_FAIL ": couln't find a free port to init webkernel");

         }

@@ -487,6 +489,7 @@ Connection: keep-alive\r\n\

         }

         close(client),client=-1;

         wk_free(web),web=NULL;

+        close(serverfd),serverfd=-1;

         sselect_free(ssel),ssel=NULL;

         free(host),host=NULL;

         return(STRING_OK);

@@ -517,6 +520,7 @@ webkernel_dual(test_action action)

         int off;

         int check;

         sselect *ssel;

+        int serverfd;

         int clients[2];

         int c;

         char *host;

@@ -544,9 +548,10 @@ Connection: keep-alive\r\n\

         check=0;

         if((ssel=sselect_init())==NULL)

                 return(STRING_FAIL ": couln't alloc a sselect structure");

-        for(port=19747,off=0;(web=wk_init(port,ssel,NULL,webkernel_basichttp,NULL,NULL,&check))==NULL;off++,port++)

+        for(port=19747,off=0;(serverfd=ipv4_server(port))==-1;off++,port++)

                 ;

-        if(web==NULL) {

+        sock_setunsafe(serverfd);

+        if((web=wk_init(serverfd,ssel,NULL,webkernel_basichttp,NULL,NULL,&check))==NULL) {

                 webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

                 return(STRING_FAIL ": couln't find a free port to init webkernel");

         }

@@ -621,6 +626,7 @@ Connection: keep-alive\r\n\

         for(c=0;c<(sizeof(clients)/sizeof(clients[0]));c++)

                 close(clients[c]),clients[c]=-1;

         wk_free(web),web=NULL;

+        close(serverfd),serverfd=-1;

         sselect_free(ssel),ssel=NULL;

         free(host),host=NULL;

         return(STRING_OK);