Changeset 71b00dcc in mainline for uspace/srv/net/module.c

Timestamp:

2010-03-07T22:51:38Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60ab6c3

Parents:

b5cbff4 (diff), 31c80a5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/module.c (modified) (6 diffs)

uspace/srv/net/module.c

@@ -60 +60 @@
  *  @returns Other error codes as defined for each specific module message function.
  */
-extern int      module_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count );
+extern int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
 
 /** External function to print the module name.
@@ -66 +66 @@
  *  The function has to be defined in each module.
  */
-extern void     module_print_name( void );
+extern void module_print_name(void);
 
 /** External module startup function.
@@ -73 +73 @@
  *  @param[in] client_connection The client connection function to be registered.
  */
-extern int      module_start( async_client_conn_t client_connection );
+extern int module_start(async_client_conn_t client_connection);
 
 /*@}*/
@@ -81 +81 @@
  *  @param[in] icall The initial message call structure.
  */
-void    client_connection( ipc_callid_t iid, ipc_call_t * icall );
+void client_connection(ipc_callid_t iid, ipc_call_t * icall);
 
 /**     Starts the module.
@@ -89 +89 @@
  *  @returns Other error codes as defined for each specific module start function.
  */
-int     main( int argc, char * argv[] );
+int main(int argc, char * argv[]);
 
-void client_connection( ipc_callid_t iid, ipc_call_t * icall ){
-        ipc_callid_t    callid;
-        ipc_call_t              call;
-        ipc_call_t              answer;
-        int                             answer_count;
-        int                             res;
+void client_connection(ipc_callid_t iid, ipc_call_t * icall){
+        ipc_callid_t callid;
+        ipc_call_t call;
+        ipc_call_t answer;
+        int answer_count;
+        int res;
 
         /*
@@ -102 +102 @@
          *  - Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0( iid, EOK );
+        ipc_answer_0(iid, EOK);
 
-        while( true ){
-                refresh_answer( & answer, & answer_count );
+        while(true){
+                refresh_answer(&answer, &answer_count);
 
-                callid = async_get_call( & call );
-                res = module_message( callid, & call, & answer, & answer_count );
+                callid = async_get_call(&call);
+                res = module_message(callid, &call, &answer, &answer_count);
 
-                if( IPC_GET_METHOD( call ) == IPC_M_PHONE_HUNGUP ) return;
+                if((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP)){
+                        return;
+                }
 
-                answer_call( callid, res, & answer, answer_count );
+                answer_call(callid, res, &answer, answer_count);
         }
 }
 
-int main( int argc, char * argv[] ){
+int main(int argc, char * argv[]){
         ERROR_DECLARE;
 
         printf("Task %d - ", task_get_id());
         module_print_name();
-        printf( "\n" );
-        if( ERROR_OCCURRED( module_start( client_connection ))){
-                printf( " - ERROR %i\n", ERROR_CODE );
+        printf("\n");
+        if(ERROR_OCCURRED(module_start(client_connection))){
+                printf(" - ERROR %i\n", ERROR_CODE);
                 return ERROR_CODE;
         }