diff options
| author | Riza Sulistyo <riza@teluu.com> | 2013-04-05 03:02:19 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2013-04-05 03:02:19 +0000 |
| commit | 3c8d3b370e33627a0a08a3bcfceaf9709e4a3991 (patch) | |
| tree | 7e65b6d873106dd32e1809f9c59ee64bb5329a6c /pjlib/src | |
| parent | cebde64ea044c362999974b662dc3e58e0577778 (diff) | |
Re #1643: Code restructure+add callback to support symbian gui app
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4461 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src')
| -rw-r--r-- | pjlib/src/pj/activesock.c | 28 | ||||
| -rw-r--r-- | pjlib/src/pj/errno.c | 3 |
2 files changed, 26 insertions, 5 deletions
diff --git a/pjlib/src/pj/activesock.c b/pjlib/src/pj/activesock.c index 2c0cad55..bbe10676 100644 --- a/pjlib/src/pj/activesock.c +++ b/pjlib/src/pj/activesock.c @@ -843,6 +843,16 @@ static void ioqueue_on_accept_complete(pj_ioqueue_key_t *key, PJ_LOG(3, ("", "Received %d consecutive errors: %d for the accept()" " operation, stopping further ioqueue accepts.", asock->err_counter, asock->last_err)); + + if ((status == PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) && + (asock->cb.on_accept_complete2)) + { + (*asock->cb.on_accept_complete2)(asock, + accept_op->new_sock, + &accept_op->rem_addr, + accept_op->rem_addr_len, + PJ_ESOCKETSTOP); + } return; } } else { @@ -850,13 +860,23 @@ static void ioqueue_on_accept_complete(pj_ioqueue_key_t *key, asock->last_err = status; } - if (status==PJ_SUCCESS && asock->cb.on_accept_complete) { + if (status==PJ_SUCCESS && (asock->cb.on_accept_complete2 || + asock->cb.on_accept_complete)) { pj_bool_t ret; /* Notify callback */ - ret = (*asock->cb.on_accept_complete)(asock, accept_op->new_sock, - &accept_op->rem_addr, - accept_op->rem_addr_len); + if (asock->cb.on_accept_complete2) { + ret = (*asock->cb.on_accept_complete2)(asock, + accept_op->new_sock, + &accept_op->rem_addr, + accept_op->rem_addr_len, + status); + } else { + ret = (*asock->cb.on_accept_complete)(asock, + accept_op->new_sock, + &accept_op->rem_addr, + accept_op->rem_addr_len); + } /* If callback returns false, we have been destroyed! */ if (!ret) diff --git a/pjlib/src/pj/errno.c b/pjlib/src/pj/errno.c index 4726b33d..ae59f450 100644 --- a/pjlib/src/pj/errno.c +++ b/pjlib/src/pj/errno.c @@ -78,7 +78,8 @@ static const struct PJ_BUILD_ERR(PJ_EIGNORED, "Ignored"), PJ_BUILD_ERR(PJ_EIPV6NOTSUP, "IPv6 is not supported"), PJ_BUILD_ERR(PJ_EAFNOTSUP, "Unsupported address family"), - PJ_BUILD_ERR(PJ_EGONE, "Object no longer exists") + PJ_BUILD_ERR(PJ_EGONE, "Object no longer exists"), + PJ_BUILD_ERR(PJ_ESOCKETSTOP, "Socket is in bad state") }; #endif /* PJ_HAS_ERROR_STRING */ |