diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2011-10-24 09:28:13 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2011-10-24 09:28:13 +0000 |
| commit | 2068f13bc42cf3a47374aa2765f82724a5782028 (patch) | |
| tree | 29fbeaa152ab51e59b650c0d7cd83a38111e1ecc /pjnath | |
| parent | 1c72a42676e7aa0c2ae0734549050f738f3bdf02 (diff) | |
Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk
* Backport of r3557:r3832
TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3841 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
| -rw-r--r-- | pjnath/src/pjnath/ice_strans.c | 6 | ||||
| -rw-r--r-- | pjnath/src/pjnath/stun_sock.c | 5 | ||||
| -rw-r--r-- | pjnath/src/pjnath/turn_sock.c | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/pjnath/src/pjnath/ice_strans.c b/pjnath/src/pjnath/ice_strans.c index 2ceaaabb..129f399b 100644 --- a/pjnath/src/pjnath/ice_strans.c +++ b/pjnath/src/pjnath/ice_strans.c @@ -1201,6 +1201,12 @@ PJ_DEF(pj_status_t) pj_ice_strans_sendto( pj_ice_strans *ice_st, PJ_STUN_SESS_LOG_RX_IND) }; + /* https://trac.pjsip.org/repos/ticket/1316 */ + if (comp->turn_sock == NULL) { + /* TURN socket error */ + return PJ_EINVALIDOP; + } + if (!comp->turn_log_off) { /* Disable logging for Send/Data indications */ PJ_LOG(5,(ice_st->obj_name, diff --git a/pjnath/src/pjnath/stun_sock.c b/pjnath/src/pjnath/stun_sock.c index 20987353..99704fb7 100644 --- a/pjnath/src/pjnath/stun_sock.c +++ b/pjnath/src/pjnath/stun_sock.c @@ -120,10 +120,11 @@ PJ_DEF(const char*) pj_stun_sock_op_name(pj_stun_sock_op op) "?", "DNS resolution", "STUN Binding request", - "Keep-alive" + "Keep-alive", + "Mapped addr. changed" }; - return op <= PJ_STUN_SOCK_KEEP_ALIVE_OP ? names[op] : "?"; + return op < PJ_ARRAY_SIZE(names) ? names[op] : "???"; }; diff --git a/pjnath/src/pjnath/turn_sock.c b/pjnath/src/pjnath/turn_sock.c index 570b197b..e841af2c 100644 --- a/pjnath/src/pjnath/turn_sock.c +++ b/pjnath/src/pjnath/turn_sock.c @@ -619,7 +619,8 @@ static pj_status_t turn_on_send_pkt(pj_turn_session *sess, if (turn_sock == NULL) { /* We've been destroyed */ - pj_assert(!"We should shutdown gracefully"); + // https://trac.pjsip.org/repos/ticket/1316 + //pj_assert(!"We should shutdown gracefully"); return PJ_EINVALIDOP; } |