[EGIT] [core/efl] master 04/05: efl_net_server_unix: do bind() from serve() method.

[Gustavo Sverzut Barbieri]

barbieri pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d0b6aa6596884fc4db5287bd8e3c2cee9db1f031

commit d0b6aa6596884fc4db5287bd8e3c2cee9db1f031
Author: Gustavo Sverzut Barbieri <barbi...@profusion.mobi>
Date:   Wed Nov 23 18:38:24 2016 -0200

    efl_net_server_unix: do bind() from serve() method.
    
    Instead of adding a job to create the socket and call bind(), do it
    straight from the serve() method, this allows the caller to set
    umask(), permissions and so on.
    
    Document this behavior in the class, since we can't extend the
    method's documentation.
---
 src/lib/ecore_con/efl_net_server_unix.c  | 23 ++++-------------------
 src/lib/ecore_con/efl_net_server_unix.eo |  6 ++++++
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/lib/ecore_con/efl_net_server_unix.c 
b/src/lib/ecore_con/efl_net_server_unix.c
index 7e90bb8..288c530 100644
--- a/src/lib/ecore_con/efl_net_server_unix.c
+++ b/src/lib/ecore_con/efl_net_server_unix.c
@@ -24,7 +24,6 @@
 
 typedef struct _Efl_Net_Server_Unix_Data
 {
-   Efl_Future *bind_job;
    Eina_Bool unlink_before_bind;
 } Efl_Net_Server_Unix_Data;
 
@@ -43,11 +42,9 @@ _efl_net_server_unix_efl_object_destructor(Eo *o, 
Efl_Net_Server_Unix_Data *pd E
    efl_destructor(efl_super(o, MY_CLASS));
 }
 
-static void
-_efl_net_server_unix_bind_job(void *data, const Efl_Event *event EINA_UNUSED)
+static Eina_Error
+_efl_net_server_unix_bind(Eo *o, Efl_Net_Server_Unix_Data *pd)
 {
-   Eo *o = data;
-   Efl_Net_Server_Unix_Data *pd = efl_data_scope_get(o, MY_CLASS);
    const char *address = efl_net_server_address_get(o);
    struct sockaddr_un addr = { .sun_family = AF_UNIX };
    socklen_t addrlen;
@@ -55,10 +52,6 @@ _efl_net_server_unix_bind_job(void *data, const Efl_Event 
*event EINA_UNUSED)
    Eina_Error err = 0;
    int r;
 
-   pd->bind_job = NULL;
-
-   efl_ref(o); /* we're emitting callbacks then continuing the workflow */
-
    efl_net_server_fd_family_set(o, AF_UNIX);
 
    do
@@ -158,8 +151,7 @@ _efl_net_server_unix_bind_job(void *data, const Efl_Event 
*event EINA_UNUSED)
         if (fd != INVALID_SOCKET) closesocket(fd);
         efl_loop_fd_set(o, SOCKET_TO_LOOP_FD(INVALID_SOCKET));
      }
-
-   efl_unref(o);
+   return err;
 }
 
 EOLIAN static Eina_Error
@@ -228,14 +220,7 @@ _efl_net_server_unix_efl_net_server_serve(Eo *o, 
Efl_Net_Server_Unix_Data *pd, c
 
    efl_net_server_address_set(o, address);
 
-   if (pd->bind_job)
-     efl_future_cancel(pd->bind_job);
-
-   efl_future_use(&pd->bind_job, efl_loop_job(efl_loop_get(o), o));
-   efl_future_then(pd->bind_job, _efl_net_server_unix_bind_job, NULL, NULL, o);
-   efl_future_link(o, pd->bind_job);
-
-   return 0;
+   return _efl_net_server_unix_bind(o, pd);
 }
 
 static Efl_Callback_Array_Item *_efl_net_server_unix_client_cbs(void);
diff --git a/src/lib/ecore_con/efl_net_server_unix.eo 
b/src/lib/ecore_con/efl_net_server_unix.eo
index 5e87ba5..accd0792 100644
--- a/src/lib/ecore_con/efl_net_server_unix.eo
+++ b/src/lib/ecore_con/efl_net_server_unix.eo
@@ -1,6 +1,12 @@
 class Efl.Net.Server.Unix (Efl.Net.Server.Fd) {
     [[An AF_UNIX server.
 
+      The @Efl.Net.Server.serve method will call bind(2) directly,
+      thus path will be accessed and created in that method. If the
+      created socket must be subject to some special mode or user,
+      change before executing that method, for example calling
+      umask(2).
+
       @since 1.19
     ]]
 

--