diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-10-07 06:04:28 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-10-07 06:04:28 +0000 |
| commit | 65a90427bd7708669faf1bade5d7987eab814139 (patch) | |
| tree | 9d95f687939756767db5c18121de8c6b2f699a7e /pjnath | |
| parent | cb83a398ee24b9ac83a3baf4202bb44dc37f9c1e (diff) | |
Minor fixes to TURN server: handle immediate recv() error, call pjnath_init() in main(), etc.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1485 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
| -rw-r--r-- | pjnath/src/pjstun-srv-test/main.c | 1 | ||||
| -rw-r--r-- | pjnath/src/pjstun-srv-test/turn_usage.c | 2 | ||||
| -rw-r--r-- | pjnath/src/pjstun-srv-test/usage.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/pjnath/src/pjstun-srv-test/main.c b/pjnath/src/pjstun-srv-test/main.c index 1b5fef3b..b7bb3b67 100644 --- a/pjnath/src/pjstun-srv-test/main.c +++ b/pjnath/src/pjstun-srv-test/main.c @@ -115,6 +115,7 @@ int main(int argc, char *argv[]) pj_init(); pjlib_util_init(); + pjnath_init(); pj_caching_pool_init(&cp, &pj_pool_factory_default_policy, 0); status = pj_stun_server_create(&cp.factory, 1, &srv); diff --git a/pjnath/src/pjstun-srv-test/turn_usage.c b/pjnath/src/pjstun-srv-test/turn_usage.c index 409db4aa..572c254a 100644 --- a/pjnath/src/pjstun-srv-test/turn_usage.c +++ b/pjnath/src/pjstun-srv-test/turn_usage.c @@ -1390,7 +1390,7 @@ static void client_on_read_complete(pj_ioqueue_key_t *key, /* Received data from peer! */ client_handle_peer_data(client, bytes_read); - } else if (bytes_read < 0) { + } else if (bytes_read <= 0) { char errmsg[PJ_ERR_MSG_SIZE]; pj_strerror(-bytes_read, errmsg, sizeof(errmsg)); PJ_LOG(4,(THIS_FILE, "TURN client %s: error reading data " diff --git a/pjnath/src/pjstun-srv-test/usage.c b/pjnath/src/pjstun-srv-test/usage.c index d3e455ad..3ab08c18 100644 --- a/pjnath/src/pjstun-srv-test/usage.c +++ b/pjnath/src/pjstun-srv-test/usage.c @@ -267,6 +267,8 @@ static void on_read_complete(pj_ioqueue_key_t *key, &worker->src_addr, &worker->src_addr_len); if (status == PJ_EPENDING) break; + else if (status != PJ_SUCCESS) + bytes_read = -status; } } |