From 570496187482666d709ad69c7585ea4c260cbc1a Mon Sep 17 00:00:00 2001 From: koinec <> Date: Sun, 15 Nov 2009 05:51:47 +0000 Subject: [PATCH] *** empty log message *** --- deamon/drd64_marshald_cmd_attach_request.c | 10 ------- deamon/drd64_marshald_dispatch.c | 42 +++++------------------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/deamon/drd64_marshald_cmd_attach_request.c b/deamon/drd64_marshald_cmd_attach_request.c index d72324d..8526b0c 100644 --- a/deamon/drd64_marshald_cmd_attach_request.c +++ b/deamon/drd64_marshald_cmd_attach_request.c @@ -247,12 +247,6 @@ int } - -//#define DRD64_CMDSTATUS_ATTACHREQ_NORMAL 0x00 -//#define DRD64_CMDSTATUS_ATTACHREQ_WAITCONNECT 0x01 -//#define DRD64_CMDSTATUS_ATTACHREQ_WAITTRANS 0x02 -//#define DRD64_CMDSTATUS_ATTACHREQ_WAITEXEC 0x03 - int Drd64_Marshald_Cmd_AttachRequest( int i_recv_id, @@ -324,10 +318,6 @@ int /* XXX : Error Proc. */ } - - //i_result = 0x02; /* XXX */ - - return i_result; } diff --git a/deamon/drd64_marshald_dispatch.c b/deamon/drd64_marshald_dispatch.c index 0868f33..4fca5eb 100644 --- a/deamon/drd64_marshald_dispatch.c +++ b/deamon/drd64_marshald_dispatch.c @@ -132,25 +132,16 @@ int p_recv_parent->b_recv_status = DRD64_SERVER_RECVSTATUS_STATUS_RESUME; - printf( "rid = %d, link = %d\n", i_recv_id, p_phead->i_resume_recvstatus_id ); } - //i_result = DRD64_MARSHALD_DISPATCH_RESULT_COMPLETE; } else if( DRD64_MARSHALD_DISPATCH_RESULT_POLL == i_result ) { p_recv->b_recv_status = DRD64_SERVER_RECVSTATUS_STATUS_STOP; - puts("poll"); - //i_result = DRD64_MARSHALD_DISPATCH_RESULT_COMPLETE; // XXX } - /*else { - Drd64_Marshald_Dispatch_InitRecvStatus( p_recv ); - // i_result = DRD64_MARSHALD_DISPATCH_RESULT_CLOSE; - }*/ /* XXX > error */ if(( DRD64_MARSHALD_DISPATCH_RESULT_COMPLETE == i_result ) || ( DRD64_MARSHALD_DISPATCH_RESULT_RESTART == i_result )) { Drd64_Server_RecvStatus_DeleteResumeChain( i_recv_id ); - puts("delete"); } return i_result; @@ -199,11 +190,6 @@ int return DRD64_MARSHALD_DISPATCH_RESULT_RECEVING; } - /*if(( DRD64_SERVER_RECVSTATUS_PHASE_END == p_recv->i_read_phase ) && - ( 0 == p_phead->i_datalen )) { - return 0x02; - }*/ - /* Check 2: Standart Packet Header Check */ /* XXX : NO implement */ @@ -219,8 +205,6 @@ int assert( NULL != p_recv_new ); Drd64_Marshald_Dispatch_InitRecvStatus( p_recv_new ); - printf("Resume Add: %d\n", i_recv_id ); - /* Exec Packet by Command-Code */ i_result = Drd64_Marshald_Dispatch_ExecPacket( @@ -242,7 +226,6 @@ int if( DRD64_SERVER_RECVSTATUS_STATUS_RESUME == p_recv->b_recv_status ) { - puts("resume exec"); i_result = Drd64_Marshald_Dispatch_ExecPacket( p_recv->i_recvstatus_id, p_recv, p_marshald ); @@ -271,13 +254,11 @@ int Drd64_Marshald_Dispatch_Polling( Drd64_Marshald_MasterInformation *p_marshald ) { -// fd_set fds_orig; fd_set fds_now; int i_cnt; int i_result; int i_err; int i_pid; - //int i_on = 0; int i_resume_flag; int i_socket_new; int i_selects_base; @@ -314,8 +295,8 @@ int DRD64_DEBUG_SYSCALL("accept(New Comm.)",i_socket_new,errno); if( -1 != i_socket_new ) { - if( i_socket_new >= i_selects_max ) /* XXX */ - { i_selects_max = i_socket_new + 1; } /* XXX */ + if( i_socket_new >= i_selects_max ) + { i_selects_max = i_socket_new + 1; } FD_SET( i_socket_new, &fds_orig ); @@ -324,11 +305,6 @@ int if( NULL != p_recv ) { Drd64_Marshald_Dispatch_InitRecvStatus( p_recv ); - - /*p_recv->i_read_phase - = DRD64_SERVER_RECVSTATUS_PHASE_HEADER; - p_recv->i_remain_bytes = sizeof( Drd64_PacketHeader ); - p_recv->pv_resume = p_recv->pv_buf;*/ } /* XXX : Error Proc. else { @@ -366,19 +342,14 @@ int /* 0x00 = Judge 1 : Disconnect ( Others Packet ) */ if( DRD64_MARSHALD_DISPATCH_RESULT_CLOSE == i_result ) { Drd64_Marshald_Dispatch_CloseSocket( i_cnt ); - /*close( i_cnt ); - FD_CLR( i_cnt, &fds_orig ); - Drd64_Server_RecvStatus_FreeRecvStatus( i_cnt );*/ } else if( DRD64_MARSHALD_DISPATCH_RESULT_RESTART - == i_result ) { - i_resume_flag = 0x01; - puts("setflag"); - } + == i_result ) + { i_resume_flag = 0x01; } /* 0x01 = Judge 1 : Reading Next */ } - /* Check TimeOut & Restart RecvStat */ // XXX : timeout + /* Check TimeOut RecvStat */ /*if( DRD64_SERVER_RECVSTATUS_STATUS_RESUME == p_recv->b_recv_status ) { i_result = Drd64_Marshald_Dispatch_ExecPacket( @@ -391,7 +362,6 @@ int /* Check Restart Packet (RecvStatus) */ if( 0x00 != i_resume_flag ) { - puts("execflag"); Drd64_Marshald_Dispatch_ExecResumeRecvStatus( &drd64_marshald_info ); } @@ -404,7 +374,7 @@ int { i_selects_max = i_selects_base; } } - /* Phase 3: Dispatch Complete-Received Packet */ + /* Phase 3: Check TimeOut Resume Packet */ /* Phase 4: Signal Check & Proc */ } -- 2.11.0