Changeset 4400
- Timestamp:
- Feb 27, 2013 2:31:05 PM (12 years ago)
- Location:
- pjproject/branches/1.x
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/1.x
- Property svn:mergeinfo changed
/pjproject/trunk merged: 4321,4324,4344
- Property svn:mergeinfo changed
-
pjproject/branches/1.x/pjnath/src/pjnath/stun_sock.c
r3944 r4400 387 387 } 388 388 389 if (stun_sock->stun_sess) { 390 pj_stun_session_set_user_data(stun_sock->stun_sess, NULL); 391 } 392 389 393 /* Destroy the active socket first just in case we'll get 390 394 * stray callback. 391 395 */ 392 396 if (stun_sock->active_sock != NULL) { 393 pj_activesock_ close(stun_sock->active_sock);397 pj_activesock_t *asock = stun_sock->active_sock; 394 398 stun_sock->active_sock = NULL; 395 399 stun_sock->sock_fd = PJ_INVALID_SOCKET; 400 pj_activesock_set_user_data(asock, NULL); 401 pj_activesock_close(asock); 396 402 } else if (stun_sock->sock_fd != PJ_INVALID_SOCKET) { 397 403 pj_sock_close(stun_sock->sock_fd); … … 616 622 617 623 stun_sock = (pj_stun_sock *) pj_stun_session_get_user_data(sess); 624 if (!stun_sock || !stun_sock->active_sock) 625 return PJ_EINVALIDOP; 618 626 619 627 pj_assert(token==INTERNAL_MSG_TOKEN); … … 644 652 645 653 stun_sock = (pj_stun_sock *) pj_stun_session_get_user_data(sess); 654 if (!stun_sock) 655 return; 646 656 647 657 PJ_UNUSED_ARG(tdata); … … 766 776 767 777 stun_sock = (pj_stun_sock*) pj_activesock_get_user_data(asock); 778 if (!stun_sock) 779 return PJ_FALSE; 768 780 769 781 /* Log socket error */ … … 830 842 831 843 stun_sock = (pj_stun_sock*) pj_activesock_get_user_data(asock); 844 if (!stun_sock) 845 return PJ_FALSE; 832 846 833 847 /* Don't report to callback if this is internal message */
Note: See TracChangeset
for help on using the changeset viewer.