Ignore:
Timestamp:
Jun 24, 2009 6:52:57 PM (12 years ago)
Author:
bennylp
Message:

Ticket #795: merged changes from ticket #794

Location:
pjproject/branches/1.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.0

  • pjproject/branches/1.0/pjmedia/src/pjmedia/sdp_neg.c

    r2394 r2795  
    423423    neg->state = PJMEDIA_SDP_NEG_STATE_WAIT_NEGO; 
    424424    if (local) { 
    425         if (!neg->initial_sdp) { 
     425        neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local); 
     426        if (neg->initial_sdp) { 
     427            /* I don't think there is anything in RFC 3264 that mandates 
     428             * answerer to place the same origin (and increment version) 
     429             * in the answer, but probably it won't hurt either. 
     430             * Note that the version will be incremented in  
     431             * pjmedia_sdp_neg_negotiate() 
     432             */ 
     433            neg->neg_local_sdp->origin.id = neg->initial_sdp->origin.id; 
     434        } else { 
    426435            neg->initial_sdp = pjmedia_sdp_session_clone(pool, local); 
    427436        } 
    428         neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local); 
    429437    } else { 
    430438        PJ_ASSERT_RETURN(neg->initial_sdp, PJMEDIA_SDPNEG_ENOINITIAL); 
Note: See TracChangeset for help on using the changeset viewer.