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

  *      28/01/2014 Creation

  *      27/05/2014 New API.

  *      28/05/2014 Implement the ipv4_* functions.

+ *      10/06/2014 Implement the sselect functions using select as backend.

  *

  * Author: Dario Rodriguez dario@softhome.net

  * This file is licensed under the terms of the GNU LGPL v2+

@@ -28,12 +29,20 @@

 #include "socklib.h"

 typedef struct _sselect {

-        int dummy;

+        int fd_set readset;

+        int fd_set writeset;

+        int maxfd;

+        int numfd;

+        int fd_set readresult;

+        int fd_set writeresult;

+        int sizeresult;

+        int readresultreturned;

+        int writeresultreturned;

 } _sselect;

 #ifndef FILLTV

-#define FILLTV(tv,sec,usec) tv.tv_sec=sec,tv.tv_usec=usec

+#define FILLTV(tv,sec,usec) (tv).tv_sec=(sec),(tv).tv_usec=(usec)

 #endif

 #ifndef FILLIPV4ADDR

@@ -217,16 +226,140 @@ sock_setblocking(int fd, int block)

         return(fcntl(fd,F_SETFL,fl));

 }

-sselect *sselect_init(void);

-int sselect_reset(sselect *ssel);

-int sselect_addread(sselect *ssel, int fd);

-int sselect_addwrite(sselect *ssel, int fd);

-int sselect_delread(sselect *ssel, int fd);

-int sselect_delwrite(sselect *ssel, int fd);

-int sselect_wait(sselect *ssel, int ms);

-int sselect_getread(sselect *ssel, int *fds, int sizefds);

-int sselect_getwrite(sselect *ssel, int *fds, int sizefds);

+sselect *

+sselect_init(void)

+{

+        _sselect *ssel;

+        if((ssel=malloc(sizeof(_sselect)))==NULL)

+                return(NULL);

+        memset(ssel,0,sizeof(_sselect));

+        sselect_reset((sselect *)ssel);

+        return((sselect *)ssel);

+}

+

+int

+sselect_reset(sselect *paramssel)

+{

+        int i;

+        _sselect *ssel=(_sselect *)paramssel;

+        if(ssel==NULL)

+                return(-1);

+        FD_ZERO(&(ssel->readset));

+        FD_ZERO(&(ssel->writeset));

+        ssel->maxfd=0;

+        ssel->numfd=0;

+        FD_ZERO(&(ssel->readresult));

+        FD_ZERO(&(ssel->writeresult));

+        return(0);

+}

+

+int

+sselect_addread(sselect *paramssel, int fd)

+{

+        int i;

+        _sselect *ssel=(_sselect *)paramssel;

+        if(ssel==NULL || fd<0 ||  FD_ISSET(fd,&(ssel->readset))

+                return(-1);

+        FD_SET(fd,&(ssel->readset));

+        if(fd>ssel->maxfd)

+                ssel->maxfd=fd;

+        ssel->numfd++;

+        return(0);

+}

+

+

+int

+sselect_addwrite(sselect *paramssel, int fd)

+{

+        int i;

+        _sselect *ssel=(_sselect *)paramssel;

+        if(ssel==NULL || fd<0 ||  FD_ISSET(fd,&(ssel->writeset))

+                return(-1);

+        FD_SET(fd,&(ssel->writeset));

+        if(fd>ssel->maxfd)

+                ssel->maxfd=fd;

+        ssel->numfd++;

+        return(0);

+}

+

+int

+sselect_delread(sselect *paramssel, int fd)

+{

+        int i;

+        _sselect *ssel=(_sselect *)paramssel;

+        if(ssel==NULL || fd<0 || !FD_ISSET(fd,&(ssel->readset))

+                return(-1);

+        FD_CLR(fd,&(ssel->readset));

+        if(fd>0 && fd==ssel->maxfd && !FD_ISSET(fd,&(ssel->writeset))

+                ssel->maxfd=fd-1;

+        ssel->numfd--;

+        return(0);

+}

+

+

+int

+sselect_delwrite(sselect *paramssel, int fd)

+{

+        int i;

+        _sselect *ssel=(_sselect *)paramssel;

+        if(ssel==NULL || fd<0 || !FD_ISSET(fd,&(ssel->writeset))

+                return(-1);

+        FD_CLR(fd,&(ssel->writeset));

+        if(fd>0 && fd==ssel->maxfd && !FD_ISSET(fd,&(ssel->readset))

+                ssel->maxfd=fd-1;

+        ssel->numfd--;

+        return(0);

+}

+

+int

+sselect_wait(sselect *paramssel, int ms)

+{

+        fd_set readset,writefd;

+        timeval tv;

+        _sselect *ssel=(_sselect *)paramssel;

+        if(ssel==NULL || ms<0)

+                return(-1);

+        memcpy(&(ssel->readresult),&(ssel->readset),sizeof(fd_set));

+        memcpy(&(ssel->writeresult),&(ssel->writeset),sizeof(fd_set));

+        ssel->readresultreturned=0;

+        ssel->writeresultreturned=0;

+        FILLTV(tv,(ms/1000),(ms%1000)*1000);

+        if((ssel->sizeresult=select(

+          ssel->maxfd+1,&(ssel->readresult),

+          &(ssel->writeresult),NULL,&tv))<0)

+                return(-1);

+        return(ssel->sizeresult);

+}

+int

+sselect_getread(sselect *paramssel, int *fds, int sizefds)

+{

+        int i,n;

+        _sselect *ssel=(_sselect *)paramssel;

+        if(ssel==NULL || fds==NULL || sizefds<1)

+                return(-1);

+        for(n=0,i=ssel->readresultreturned;i<ssel->maxfd && n<sizeofds;i++) {

+                if(FD_ISSET(i,&(ssel->readresult)))

+                        fds[n++]=i;

+        }

+        ssel->readresultreturned=i;

+        return(n);

+}

+

+int

+sselect_getwrite(sselect *paramssel, int *fds, int sizefds)

+{

+        int i,n;

+        _sselect *ssel=(_sselect *)paramssel;

+        if(ssel==NULL || fds==NULL || sizefds<1)

+                return(-1);

+        for(n=0,i=ssel->writeresultreturned;i<ssel->maxfd && n<sizeofds;i++) {

+                if(FD_ISSET(i,&(ssel->writeresult)))

+                        fds[n++]=i;

+        }

+        ssel->writeresultreturned=i;

+        return(n);

+}

 /* aux functions */

 void