From faede3bfd55af757bd3b76b075d435d6b31b2c0f Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Wed, 2 May 2007 18:54:19 +0000 Subject: Errno and memory size tweaking for Symbian git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1244 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/src/pj/ioqueue_symbian.cpp | 59 ++++++++++------------------------------ 1 file changed, 14 insertions(+), 45 deletions(-) (limited to 'pjlib/src/pj/ioqueue_symbian.cpp') diff --git a/pjlib/src/pj/ioqueue_symbian.cpp b/pjlib/src/pj/ioqueue_symbian.cpp index 50f33503..df1fa46c 100644 --- a/pjlib/src/pj/ioqueue_symbian.cpp +++ b/pjlib/src/pj/ioqueue_symbian.cpp @@ -216,23 +216,8 @@ pj_status_t CIoqueueCallback::StartRead(pj_ioqueue_op_key_t *op_key, sock_->Socket().Recv(aBufferPtr_, flags, iStatus); } - if (iStatus==KRequestPending) { - SetActive(); - return PJ_EPENDING; - } else { - // Complete immediately (with success or error) - if (iStatus == KErrNone) { - *size = aBufferPtr_.Length(); - HandleReadCompletion(); - return PJ_SUCCESS; - } - else { - pending_data_.read_.op_key_ = NULL; - pending_data_.read_.addr_ = NULL; - pending_data_.read_.addrlen_ = NULL; - return PJ_RETURN_OS_ERROR(iStatus.Int()); - } - } + SetActive(); + return PJ_EPENDING; } @@ -260,24 +245,8 @@ pj_status_t CIoqueueCallback::StartAccept(pj_ioqueue_op_key_t *op_key, type_ = TYPE_ACCEPT; sock_->Socket().Accept(blank_sock_, iStatus); - if (iStatus==KRequestPending) { - SetActive(); - return PJ_EPENDING; - } else { - // Accept() completed immediately (with success or error). - if (iStatus == KErrNone) { - HandleAcceptCompletion(); - return PJ_SUCCESS; - } - else { - pending_data_.accept_.op_key_ = NULL; - pending_data_.accept_.new_sock_ = NULL; - pending_data_.accept_.local_ = NULL; - pending_data_.accept_.remote_ = NULL; - pending_data_.accept_.addrlen_ = NULL; - return PJ_RETURN_OS_ERROR(iStatus.Int()); - } - } + SetActive(); + return PJ_EPENDING; } @@ -286,17 +255,17 @@ pj_status_t CIoqueueCallback::StartAccept(pj_ioqueue_op_key_t *op_key, // void CIoqueueCallback::HandleReadCompletion() { - if (pending_data_.read_.addr_) { - PjSymbianOS::Addr2pj(aAddress_, - *(pj_sockaddr_in*)pending_data_.read_.addr_); - pending_data_.read_.addr_ = NULL; - } - if (pending_data_.read_.addrlen_) { - *pending_data_.read_.addrlen_ = sizeof(pj_sockaddr_in); - pending_data_.read_.addrlen_ = NULL; - } + if (pending_data_.read_.addr_) { + PjSymbianOS::Addr2pj(aAddress_, + *(pj_sockaddr_in*)pending_data_.read_.addr_); + pending_data_.read_.addr_ = NULL; + } + if (pending_data_.read_.addrlen_) { + *pending_data_.read_.addrlen_ = sizeof(pj_sockaddr_in); + pending_data_.read_.addrlen_ = NULL; + } - pending_data_.read_.op_key_ = NULL; + pending_data_.read_.op_key_ = NULL; } -- cgit v1.2.3