Changes in uspace/srv/net/modules.c [bc9da2a:7fb2ce3] in mainline

File:

• uspace/srv/net/modules.c (modified) (2 diffs)

uspace/srv/net/modules.c

@@ -55 +55 @@
 
 int connect_to_service_timeout( services_t need, suseconds_t timeout ){
-        if (timeout <= 0)
-                return async_connect_me_to_blocking( PHONE_NS, need, 0, 0);
-        
+        ipcarg_t phone;
+        int res;
+
         while( true ){
-                int phone;
-
-                phone = async_connect_me_to( PHONE_NS, need, 0, 0);
-                if( (phone >= 0) || (phone != ENOENT) )
+                res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, & phone );
+                if( res >= 0 ){
                         return phone;
-        
-                timeout -= MODULE_WAIT_TIME;
-                if( timeout <= 0 ) return ETIMEOUT;
-
+                }
+                if( timeout > 0 ){
+                        timeout -= MODULE_WAIT_TIME;
+                        if( timeout <= 0 ) return ETIMEOUT;
+                }
                 usleep( MODULE_WAIT_TIME );
         }
@@ -85 +84 @@
         if( phone >= 0 ){
                 if( ERROR_OCCURRED( ipc_connect_to_me( phone, arg1, arg2, arg3, & phonehash ))){
-                        ipc_hangup( phone );
+                        async_msg_0( phone, IPC_M_PHONE_HUNGUP );
                         return ERROR_CODE;
                 }