Changeset 3217 for pjproject/trunk/pjmedia/include/pjmedia/sdp_neg.h

Timestamp:

Jun 23, 2010 12:21:20 PM (14 years ago)

Author:

bennylp

Message:

Another unterminated SDP offer/answer negotiation fix (Re: #1045):

• fixed unterminated negotiation if our media transport rejects incoming offer (e.g. due to mismatch SRTP transport) with 488.
• to fix the above, modified the SDP negotiator (sdp_neg.[hc])'s pjmedia_sdp_neg_cancel_offer() to also be able to cancel in remote offer state
• also fixed the bug introduced previous Session Timer fix (Re: #1047), which cause SDP negotiator's state to be cleared after failed UAC UPDATE transaction is terminated, which means UPDATE can only be sent 5 seconds after the last UPDATE if the last UPDATE failed.

File:

• pjproject/trunk/pjmedia/include/pjmedia/sdp_neg.h (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/sdp_neg.h

@@ -623 +623 @@
 
 /**
- * Cancel previously sent offer, and move negotiator state back to
- * previous stable state (PJMEDIA_SDP_NEG_STATE_DONE). The negotiator
- * must be in PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER state.
+ * Cancel any pending offer, whether the offer is initiated by local or
+ * remote, and move negotiator state back to previous stable state
+ * (PJMEDIA_SDP_NEG_STATE_DONE). The negotiator must be in
+ * PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER or PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER
+ * state.
  *
  * @param neg           The negotiator.