@@ -18,7 +18,6 @@

 #define STRING_OK "ok"

 #define STRING_FAIL "fail"

-#define STRING_SEP ":"

 typedef enum test_action {

         test_name=0,

@@ -27,10 +26,15 @@ typedef enum test_action {

 } test_action;

 char *test1(test_action action);

+char *socklib_connect(test_action action);

+char *socklib_sselect(test_action action);

 struct {

         char *(*test)(/* test_action action */);

-} tests[]={{test1}};

+} tests[]={{test1},

+           {socklib_connect},

+           {socklib_sselect},

+          };

 int

 main(int argc, char *argv[])

@@ -80,4 +84,192 @@ test1(test_action action)

         return("ok");

 }

+char *

+socklib_connect(test_action action)

+{

+        int server,client;

+        char *host;

+        long hostsize;

+        int port;

+        int off;

+        int timeout=100;

+        if(action==test_name)

+                return("socklib_connect");

+        if(action==test_description)

+                return("listen and connect");

+        if((host=ipv4_genip("localhost",&hostsize))==NULL)

+                return(STRING_FAIL ": couldn't resove localhost");

+        for(server=-1,off=0,port=19747;off<1024;off++,port++) {

+                if((server=ipv4_serverbinded(host,hostsize,port))!=-1)

+                        break;

+        }

+        if(server==-1) {

+                free(host),host=NULL;

+                return(STRING_FAIL ": couldn't find empty port for server\n");

+        }

+        sock_setunsafe(server);

+        if((client=ipv4_preconnect(host,hostsize,port))==-1) {

+                close(server),server=-1;

+                free(host),host=NULL;

+                return(STRING_FAIL ": couldn't connect to server\n");

+        }

+        if(ipv4_connect(client,timeout)==-1) {

+                close(client),client=-1;

+                close(server),server=-1;

+                free(host),host=NULL;

+                return(STRING_FAIL ": timeout on connect\n");

+        }

+        ipv4_postconnect(client);

+        close(client),client=-1;

+        close(server),server=-1;

+        free(host),host=NULL;

+        return(STRING_OK);

+}

+

+char *

+test_socketsinit(int *server, int *client, char **host, long *hostsize, int *port)

+{

+        int timeout=100;

+        int off;

+        *server=*client=*port=-1;

+        *hostsize=0;

+        *host=NULL;

+        *port=-1;

+        if((*host=ipv4_genip("localhost",hostsize))==NULL)

+                return(STRING_FAIL ": couldn't resove localhost");

+        for(*server=-1,off=0,*port=19747;off<1024;off++,(*port)++) {

+                if((*server=ipv4_serverbinded(*host,*hostsize,*port))!=-1)

+                        break;

+        }

+        if(*server==-1) {

+                free(*host),*host=NULL;

+                return(STRING_FAIL ": couldn't find empty port for server\n");

+        }

+        sock_setunsafe(*server);

+        if((*client=ipv4_preconnect(*host,*hostsize,*port))==-1) {

+                close(*server),*server=-1;

+                free(*host),*host=NULL;

+                return(STRING_FAIL ": couldn't connect to server\n");

+        }

+        if(ipv4_connect(*client,timeout)==-1) {

+                close(*client),*client=-1;

+                close(*server),*server=-1;

+                free(*host),*host=NULL;

+                return(STRING_FAIL ": timeout on connect\n");

+        }

+        ipv4_postconnect(*client);

+        return(NULL);

+}

+

+void

+test_socketsfini(int *server, int *client, char **host, long *hostsize, int *port)

+{

+        if(*server!=-1)

+                close(*server),*server=-1;

+        if(*client!=-1)

+                close(*client),*client=-1;

+        if(*host!=NULL)

+                free(*host),*host=NULL;

+        *hostsize=0;

+        *port=-1;

+}

+

+char *

+socklib_sselect(test_action action)

+{

+        int server,client;

+        char *host;

+        long hostsize;

+        int port;

+        char *result;

+        char buf[128];

+        int readyfds[16];

+        sselect *ssel;

+        int timeout=100;

+        int workfd;

+        if(action==test_name)

+                return("socklib_sselect");

+        if(action==test_description)

+                return("select over sockets");

+        if((result=test_socketsinit(&server,&client,&host,&hostsize,&port))!=NULL) {

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(result);

+        }

+        if((ssel=sselect_init())==NULL) {

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": couldn't init sselect struct");

+        }

+        if(sselect_reset(ssel)!=0) {

+                sselect_free(ssel),ssel=NULL;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": couldn't test the sselect reset function");

+        }

+        if(sselect_wait(ssel,timeout)!=0) {

+                sselect_free(ssel),ssel=NULL;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": (1) was expecting a timeout, something else happened");

+        }

+        if(sselect_addread(ssel,server,buf)!=0) {

+                sselect_free(ssel),ssel=NULL;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": couldn't add 'read serverfd' to the sselect");

+        }

+        if(sselect_wait(ssel,timeout)!=1) {

+                sselect_free(ssel),ssel=NULL;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": (2) was expecting a ready-to-read, something else happened");

+        }

+        if((workfd=sock_accept(server))==-1) {

+                sselect_free(ssel),ssel=NULL;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": couldn't accept connection");

+        }

+        write(client,".",1);

+        if(sselect_wait(ssel,timeout)!=0) {

+                sselect_free(ssel),ssel=NULL;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": (2) was expecting a timeout, something else happened");

+        }

+        if(sselect_addread(ssel,workfd,&workfd)!=0) {

+                sselect_free(ssel),ssel=NULL;

+                close(workfd),workfd=-1;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": couldn't add 'read workfd' to the sselect");

+        }

+        if(sselect_wait(ssel,timeout)!=1) {

+                sselect_free(ssel),ssel=NULL;

+                close(workfd),workfd=-1;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": was expecting a something-to-read, something else happened");

+        }

+        if((sselect_getread(ssel,readyfds,sizeof(readyfds)/sizeof(readyfds[0])))!=1 || *readyfds!=workfd) {

+                sselect_free(ssel),ssel=NULL;

+                close(workfd),workfd=-1;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": the list of ready-to-read fds is wrong");

+        }

+        if(sselect_getuserptr(ssel,workfd)!=&workfd) {

+                sselect_free(ssel),ssel=NULL;

+                close(workfd),workfd=-1;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": Couldn't recover the userptr of workfd");

+        }

+        read(workfd,buf,1);

+        if(sselect_addwrite(ssel,client,buf)!=0) {

+                sselect_free(ssel),ssel=NULL;

+                close(workfd),workfd=-1;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": couldn't add 'write clientfd' to the sselect");

+        }

+        if(sselect_wait(ssel,timeout)!=1) {

+                sselect_free(ssel),ssel=NULL;

+                close(workfd),workfd=-1;

+                test_socketsfini(&server,&client,&host,&hostsize,&port);

+                return(STRING_FAIL ": was expecting an ok-to-write, something else happened");

+        }

+        sselect_free(ssel),ssel=NULL;

+        close(workfd),workfd=-1;

+        test_socketsfini(&server,&client,&host,&hostsize,&port);

+        return(STRING_OK);

+}