@@ -52,6 +52,7 @@ main(int argc, char *argv[])

 {

         int port;

         int timeout=500;

+        int serverfd;

         kakumei *ka,kastore;

         memset(&kastore,0,sizeof(kastore));

         ka=&kastore;

@@ -61,21 +62,27 @@ main(int argc, char *argv[])

         }

         port=atoi(argv[1]);

         if(kaconfig_exists(CONFIGFILE)!=0) {

-		log_setlogfile(CFLOGFILE);

+                log_setlogfile(CFLOGFILE);

                 log_write("INIT","Config file not found, writing default file %s",CONFIGFILE);

                 kaconfig_write(CONFIGFILE,CFLOGFILE,CFCOOKIENAME,CFCOOKIEDOMAIN,CFBANNERPATH,CFSSLPROXY);

         }

         if((ka->config=kaconfig_init(CONFIGFILE))==NULL) {

-		log_setlogfile(CFLOGFILE);

+                log_setlogfile(CFLOGFILE);

                 log_write("INIT","ERROR: insufficient memory or config file error");

                 return(1);

         }

-	log_setlogfile((ka->config->logfile!=NULL)?ka->config->logfile:CFLOGFILE);

+        log_setlogfile((ka->config->logfile!=NULL)?ka->config->logfile:CFLOGFILE);

         if((ka->ssel=sselect_init())==NULL) {

                 log_write("INIT","ERROR: insufficient memory");

                 return(1);

         }

-        if((ka->web=wk_init(port,ka->ssel,NULL,callback_http,NULL,NULL,ka))==NULL) {

+        if((serverfd=ipv4_server(port))==-1) {

+                sselect_free(ka->ssel),ka->ssel=NULL;

+                log_write("INIT","ERROR: couldn't listen on port");

+                return(2);

+        }

+        sock_setunsafe(serverfd);

+        if((ka->web=wk_init(serverfd,ka->ssel,NULL,callback_http,NULL,NULL,ka))==NULL) {

                 sselect_free(ka->ssel),ka->ssel=NULL;

                 log_write("INIT","ERROR: couldn't init web server");

                 return(2);

@@ -88,6 +95,7 @@ main(int argc, char *argv[])

                 wk_service(ka->web);

         }

         wk_free(ka->web),ka->web=NULL;

+        close(serverfd),serverfd=-1;

         sselect_free(ka->ssel),ka->ssel=NULL;

         kaconfig_free(ka->config),ka->config=NULL;

         log_write("FINI","SIGINT detected, exiting...");