@@ -3,12 +3,6 @@

  *

  * Handy functions for IPv4 socket connections.

  *

- * History:

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

  */

@@ -333,8 +327,10 @@ sselect_getread(sselect *paramssel, int *fds, int sizefds)

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

                 return(-1);

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

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

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

                         fds[n++]=i;

+                        FD_CLR(i,&(ssel->readresult));

+                }

         }

         ssel->readresultreturned=i;

         return(n);

@@ -348,13 +344,49 @@ sselect_getwrite(sselect *paramssel, int *fds, int sizefds)

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

                 return(-1);

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

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

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

                         fds[n++]=i;

+                        FD_CLR(i,&(ssel->writeresult));

+                }

         }

         ssel->writeresultreturned=i;

         return(n);

 }

+/* advanced sselect functions */

+int

+sselect_getreadfiltered(sselect *paramssel, fd_set *filter, int *fds, int sizefds)

+{

+        int i,n;

+        _sselect *ssel=(_sselect *)paramssel;

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

+                return(-1);

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

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

+                        fds[n++]=i;

+                        FD_CLR(i,&(ssel->readresult));

+                }

+        }

+        return(n);

+}

+

+int

+sselect_getwritefiltered(sselect *paramssel, fd_set *filter, int *fds, int sizefds)

+{

+        int i,n;

+        _sselect *ssel=(_sselect *)paramssel;

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

+                return(-1);

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

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

+                        fds[n++]=i;

+                        FD_CLR(i,&(ssel->writeresult));

+                }

+        }

+        return(n);

+}

+

+

 /* aux functions */

 void

 sock_setfast(int fd)

@@ -8,12 +8,6 @@

  * is to integrate the sock_connect() timeout inside the main

  * loop as to don't be blocking.

  *

- * History:

- *      27/01/2014 Creation

- *       3/04/2014 Add async-connect functions, add fd_set to select

- *      27/05/2014 Rethought the API; separate ipv4 from general functions,

- *                 rework select so that epoll usage is possible.

- *

  * Documentation used:

  *   http://www.beej.us/guide/bgnet/output/html/multipage/getaddrinfoman.html

  *

@@ -48,6 +42,11 @@ 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);

+/* advanced sselect functions */

+int sselect_getreadfiltered(sselect *ssel, fd_set *filter, int *fds, int sizefds);

+int sselect_getwritefiltered(sselect *ssel, fd_set *filter, int *fds, int sizefds);

+

+/* socket configuration functions */

 void sock_setfast(int fd); /* mark as low-bandwidth interactive stream */

 void sock_setunsafe(int fd); /* for server sockets, configure reuseaddress, linger: only suitable for intranet usage */