Changeset 3020


Ignore:
Timestamp:
Nov 20, 2009 7:48:41 AM (10 years ago)
Author:
nanang
Message:

Ticket #957:

  • Fixed compile error of incompatible param type (or bad type conversion) on Symbian 5th ed (and perhaps also on some GCC versions).
  • Fixed on_connect_complete() to reset SSL sock state before callback when connection fails (OpenSSL impl).
  • Fixed saving remote address before start connecting, so it won't miss remote address info when socket connection establishes immediately (OpenSSL impl).
Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

    r3006 r3020  
    768768    /* Connecting */ 
    769769    else { 
     770        /* On failure, reset SSL socket state first, as app may try to  
     771         * reconnect in the callback. 
     772         */ 
     773        if (status != PJ_SUCCESS) { 
     774            reset_ssl_sock_state(ssock); 
     775        } 
    770776        if (ssock->param.cb.on_connect_complete) { 
    771777            pj_bool_t ret; 
     
    773779            if (ret == PJ_FALSE) 
    774780                return PJ_FALSE; 
    775         } 
    776         if (status != PJ_SUCCESS) { 
    777             /* Reset SSL socket state */ 
    778             reset_ssl_sock_state(ssock); 
    779781        } 
    780782    } 
     
    20782080        goto on_error; 
    20792081 
     2082    /* Save remote address */ 
     2083    pj_sockaddr_cp(&ssock->rem_addr, remaddr); 
     2084 
    20802085    status = pj_activesock_start_connect(ssock->asock, pool, remaddr, 
    20812086                                         addr_len); 
     
    20982103     */ 
    20992104 
    2100     /* Set remote address */ 
    2101     pj_sockaddr_cp(&ssock->rem_addr, remaddr); 
    2102  
    21032105    /* Update SSL state */ 
    21042106    ssock->is_server = PJ_FALSE; 
  • pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

    r3000 r3020  
    885885            { 
    886886                /* Update port only */ 
    887                 pj_sockaddr_set_port((pj_sockaddr_t*)&tls->base.local_addr,  
     887                pj_sockaddr_set_port(&tls->base.local_addr,  
    888888                                     new_port); 
    889889            } 
Note: See TracChangeset for help on using the changeset viewer.